Better separation of layers