Rest crud + some tweaks