Deprecated internal methods (TODO hide later)