Added feature class. Tried refactoring the old code