Updated Common module
Refactored parts; added collections for much more flexibility
Added some checks to the building of components