Improved Command Parser