Merge minimal admin class into normal admin

Related to #41