Refactor Boundary to be more "REST like"