Added some custom constructor logic to enhance the information richness