Made entity an immutable value object