Added custom matcher and improved stuff everywhere