Separated entity and view services