Added modal window support