Add extract functions