Continued architectural implementation.