Move ChannelKeys creation into channelmanager