 	///   - bookId: Book ID
 	///   - page: Page number
 	/// - Returns: Return a list of Highlights
+	@available(*, deprecated, message: "Use 'allByBookId(withConfiguration:bookId:andPage:)' instead.")
 	public static func allByBookId(_ bookId: String, andPage page: NSNumber? = nil) -> [Highlight] {
-		// TODO_SMF_DEPRECATE
 		return Highlight.allByBookId(withConfiguration: Highlight.readerConfig, bookId: bookId, andPage: page)
 	}
 


extension Highlight {

	private static var readerConfig : FolioReaderConfig {
		// TODO_SMF_DEPRECATE
		return FolioReader.shared.readerContainer!.readerConfig
	}

	/// Save a Highlight with completion block
	///
	/// - Parameter completion: Completion block
	public func persist(_ completion: Completion? = nil) {
		// TODO_SMF_DEPRECATE
		self.persist(withConfiguration: Highlight.readerConfig, completion: completion)
	}

	/// Return all Highlights
	///
	/// - Returns: Return all Highlights
	public static func all() -> [Highlight] {
		// TODO_SMF_DEPRECATE
		return Highlight.all(withConfiguration: Highlight.readerConfig)
	}


	///
	/// - Parameter highlightId: The ID to be removed
	/// - Returns: The removed id
	@available(*, deprecated, message: "Use 'removeFromHTMLById(withinPage:highlightId:)' instead.")
	@discardableResult public static func removeFromHTMLById(_ highlightId: String) -> String? {
		let page = FolioReader.shared.readerCenter?.currentPage
		return self.removeFromHTMLById(withinPage: page, highlightId: highlightId)
	}
