Include new abstractions in deployment package #3
Add new definitions in deployment package #2