Use more OOP approach