Minor updates to Domains module. Added some TODO's.