update user_core

Change data struct a bit as well as clean up interface to data sources.