Added data class and modified user class

Please enter the commit message for your changes. Lines starting