Fixed orm api