Architecture improvement, multi-objects