Feature/refinements