Update

1.6 support, remaps and new classes!