Organization Support
Add some documentation and annotations.