Try to remove cyclic dependency between main package an commons options implementation.