Updated availability form to include new fields