Extend Image layer definition + small fixes