Merging 0.3 functionality (admin)