Added to main class