Added wrappers for devices