Made more modular