added check operation
Fixed mapping in columns