Made implementation more modular