Switched back to integers as annotation parameters (e.g. view ids). Performance improvements.