Update User class to avoid extending ExtendUser