Changed to generic aware objects