Replaced options with special form