Removed domain checking