Added fiplr support