Updated user class
Updated App class