start to new Version of Bidimap extract all to seperate Class