Refactor: Push details down into from-fake-maps