OP-421 Added some TODO comments to Domain classes