Adding commponent support