Added Keywords and New Dialog