Extracted interface from data mappers, added methods for saving tokens and users, fixed typos