Little modification in REST API, added naive like system