Add validation and fixtures