Added weak inside property block to avoid retain cycles