Fix structure of impl