Replace som constants
#2 : Sort fields on entities