Refactor to LWRP