EST-408: Make entities immutable and provide modifiers