Refined some components