Improves devices APIs
Removes useless inheritance