Adaptions  for django 1.6