Added some synonyms for previous, next and current and made it more strict