Tested updated domain structure, need to implement the view changes