Adjust core data implementation
Fixed up core data, currently it working nicely