Move ES concerns to model/concerns