Added mapq and control options