Add revisited read-macro
Add more sources