Closes #20 // Removed YAML Loader hack in favor of duplicating service reference logic as it was a small method