Added mapred support