Standardized callbacks. Added more svn paths.