Added possibility to extract polarzation