Added Note and Asset Support