Add support for rest
Add notes lookup table