Added initial implementation for core