Support for Customs object, changes in tests and sample project