Made stuff more modular