Address comments from Armando on consent functionality, add specs