Impemented architecture for #48