some config changes and add users data model