[ADD] Add several customization modules and some UoS fix