Architecture + bugfix