FIX: Removed service field, and added parameterized constructor