Moved Custom Matchers and added Build Indicator