Modifying data type for User class; fix #12