more core functions support added