Updated hierarchy and added Index design