Add disable loops and add validate callback