Improve layer reuse

Layers should be reused to reduce the required space.