profile: imporved components structure