Refactor + domain check builder
Bump version