Added functionality to the main class