Design of architecture commit #1