Updated code

Added additional options and made it easier to add other services.
Minor Bug Fix

Fixed a minor bug