[Core] - Made everything extendable