Domain model still in flux