Added check and map for ruby2.1