Refactor according to the latest snapshots of of longneck-core.