Core refactor + RMI update.