Added component related code