AMS - Add validation on availability