Adapted the new Core API