Decouple Object from Core. #10