Updated Device package
Added more stuff