Try to make domain independent