Rewrote class parsing logic to allow static methods