Temporarily made a check for Vault
Added custom player object and handler