Updated the User definition to include locked status