Removed classes and defined as normal functions