Fix bugs and add Modifier validator
add to_dict method