Modified Classes and added player properties