Improve player view-model