Sage goes more CQS style