Improve Kuest Legacy Airlock base model