Added options singleton