Modified various components