Updated features code (Performance purposes). Updated Parser Classes.