Introducing model and improved data method to avoid override