Add support for patch overlay