Added User and Device class