Eliminated multiple REST methods, made module a bit more generic