Rearrange some metrics and added Spider detection