Adding new architecture for less dependency