Move stuff out of entity header