Added and improved Options