Added extensions to the swift files for more clarity and composer