Adding match_spec, container_spec and delayed
Adding choice validator
Version bump