Implemented object mapping + implementing edge mapping