Added necessary functions/tables