[ADD] Some refinement