enhance

enhance methods and domain