Cleaned up return values from UserDatastore methods
Basic models should now be complete. Closes #14