Added more attributes, only annotations missing now