Additional core user work