[UPDATE] add more component helpers