Fixed up components module;