better graphiti mapping