Refactor Engine
Initial setter