Update with latest CSLA code