Updates parsing for derived attributes
Updates parsing (bug in declarations table)