Add more things to whitelist and re-organise it