Adaptations to make it more modular and independent