Updated app and modules
Remove dependency on unpredictable clause ordering