Moved calls into a device ready handler