Add comments and type