Partially modified classes for mobile service, added sorting, fixes