Change architecture slightly