Updated Player and Form class