Moved user fields functions to proper file.