Added notes support