Removing sub dependency to core module so that it can be customized on a per project basis if needed.
