refactoring to match version 0.10.x