Automatic layer management