Tweaked models to work on any django install