Add support for background