Attempt to add support for gecoding