Added missing classes declarations