Improve validation and conflicts management (Air)