Add changes for annotation scanning to server json correctly.