Better handling identity encoding
Remove preferred prefix from methods