Users pdf refactor