Enquiries design and validation logic complete