Updated Main Classes to work with the updates