Implemented new short option handling