Move this to interface-descriptor ?