Added support for custom modifications via auto-detected callbacks