Architecture modification to prepare Express