Re-integrando as classes perdidas no ultimo merge