Add new applications
Add some missing constraints