WIP: Adding domain validator