* Improved admin and added fields