Resolving #43 and updating admin models to reflect doc examples