Adding some architecture.