Re integrated classes (to avoid local dependencies)