Put back individual features instead of aggregate OSS features (need to look into how best to arrange this wrt. PRO)