Continue working on architecture