Add reflection
Merge changes