Adding support for not breaking build