Extracted soring into separate hierarchy