fix zsever regex
add domain
move some procedures to model