Added flags and key shortcuts