Added a few more whitelisted items
Further refactoring of indicator_extractor