Added swagger support, refined style and integration