better flow for building up context and attributes
2.0.3