Add more analysis