added refactored objects