Updated to Curse's Updated API