Simplify architecture