Improved domain objects lookup