Added raw input features and optimised prime list storage