Remove types and add DataSection Manager