Reconfigured tern and tagbar