Add support for new ready() system