Fixed logical tree, added ContentPropertyAttribute