removed collection of handlers, separate client and instance handlers

added check to default handler