Better opts handling