Updated with login and data store