Marco futuros refactor