Merge "Added new devices schema"