More work on architecture