Added better admin integration and model helper methods