Modified navigation classes