Ignoring addons folder
Updated to handle multiple field type