Implemented options everywhere