Removed the static nature from the classes