Added optional changes