Options parsing added