Add support to validation