Added support of popups