More interface extensions and annotations.

Signed-off-by: Nathan T Freeman <nathan.freeman@redpilldevelopment.com>