Refactor specs compatible 2.3