Removed Company class, added frequecy calculations to Service