Extend model

Begin admin commnds
Improve architecture