Added missing class and header