Work on validator
Add group asset management