FIX (src): Fix all rest-code. This working well done since now