fixed dict and method wrappers for normal mode