[refactor] Increased Neat's extensibility (10m)