Improved admin and fixed UUID and Datetime bug