Fix OOP and specs