add default logic
move to  default instance
refactaring use, use, use...