Add preposition logic where needed