Further work done on the Device part