Ported few customizations