Huge architecture improvements