Improve player managment