Sync up with framework code