Fixing basic architecture.