Refactor to use current user