Refinements in frontend