Exposed more service location to allow multiple toys of a single type to be used.
Added name to the service class.