Validation added to entities