Get rid of Future in the attribute map