Fixed related data issue
Updated version