(TK-3) Change to map of handler collections

Change to map of handler collections instead of a single
collection so that multiple servers can have different handlers.