Improve Lore system