True, in the first place it was a bit more complicated but now it's just two classes. Removed it :)