Added functions to help extract data