Extend from Layer instead