Added support for string from player and clean up