Notes management added.