Add super class source and fix searching bound