Added white list
Cleanup