Added TYPE_PLAYER