Added features and attribution