More work on the architecture