Refractured some names, fixed inheritence bugs and added profile fields allowed update list