Add handler for packaging