Added for building with kiwi