Added basic functions to the main class