Update to work with Valice Bundle
Update for version 1.1.7