Simplification of the implementation