Domain object overhauled