some minor changes
using universal domain models