Added missing Classes