Start using Projection and Context.  Feels a little clunky :(