Changed class structure (kinda agile)