Add new modal features #24