Additional attributes

partial changes from #63