Domain ready version

- Working with domains