Update composer + Architecture + Comments