Added some refinements