Added initial Navigator support