refactor; custom identity format
1.11.0