Adjusted to Extendo API changes