Refactory REST