Add types handlers