Attributes -> Annotations and change key structure

Signed-off-by: Michael Bridgen <mikeb@squaremobius.net>