Replaced Class with Type, implementing lighter-common modules