Improved strategy parsing