Added better options syntax