Added property options restrict and value_map; added functionality for aliases and value_map