Refactored unity helper into separate project