Added few constructs for core