Validator updates
Use listener
Meta additions