Refactored in MVP functionality