Add klassik and rmp