Add architecture for basic functions