Entry workflow polished