Add baseTag support