[Core] Updated build defintions. Thanks lfxgroove