Update Router and Project classes