Extended for legacy support