Refactor users to easy extends