Athletics import improvements