Add naive layer management