Add popups and additional params