misc changes for introducing raw handler in models