Worked on Feature Generation. More changes to the API.