Add more program validations