Transaction added, more service methods implemented + Refactoring