Added reflection classes, fix #555