Cleaned up ComponentHandler