Added conditionals around component registration.