Adding object mapping in shepherd