added some features at core