Added support for background