Fixed None handling. Removed dict wrapper.