Added more reflection code