Factory of proposal refactored - closed #13