Domain file added + validation fixes