Updates to Rock framework