#19 added comments about architecture evolutions