Added generic Modal class