Decorator and Dictionary enhancements

- Allowing `map_attr` and `store` to be used together.
- Allowing `Dictionary` containers to be used as attributes.