Improve a little the design