Added more stuff from old evodjango