Adding classes moved from other libs.