Added file-feature mapping, adjusted feature model and annotations.