Input classes, logic cleaning, entity base changes