[TASK] Change to support Neos 1.0