Improve on Player and Container