Adding support for the main domain and stuff