Appears to be working with refactored schema