Added RPG support