Added map reduce filter and signature naming more swifty