Added missing required classes