Adding modal capabilities