Added todo for refinement
Moved monkey patches into core_extensions refinement