Made dependencies forwards compatible