Added some lookup functions and DS annotations.