Nitesh, since I've merged this already can you submit a pull request to optimize this?