Very basic work for compatibility with Hathor