added polymer support