Added missing redefinitions