Use new way to declare entities