Added device entries, WIP