Devices handle metadata now & better parsing