Better handling of the modal for building attributes