Updated the component functions

issue: #1148