Changing awareness interface to be more generic