Add additional handlers