Added Further Structure to parsing classes