comnplete remaining mappers and models