Fixed at least one issue with the class structure