[Core] - Cleaned up the public methods