Updated with specific components