This seems more internal to your project that something that should be in this pull request