Moved request view entities to separate file