Added TagService and TransactionService + some refactor