Added notes support, target and arrows constructors