diff --git a/pom.xml b/pom.xml
index 0726c87e..2eb1ada6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.0.M4</version>
+		<version>2.1.0.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 
@@ -29,10 +29,6 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-webflux</artifactId>
diff --git a/src/main/java/guru/springframework/api/domain/Billing.java b/src/main/java/guru/springframework/api/domain/Billing.java
new file mode 100755
index 00000000..e90c9a5b
--- /dev/null
+++ b/src/main/java/guru/springframework/api/domain/Billing.java
@@ -0,0 +1,31 @@
+
+package guru.springframework.api.domain;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Billing implements Serializable
+{
+
+    private Card card;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private final static long serialVersionUID = 6577338081290507077L;
+
+    public Card getCard() {
+        return card;
+    }
+
+    public void setCard(Card card) {
+        this.card = card;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}
diff --git a/src/main/java/guru/springframework/api/domain/Card.java b/src/main/java/guru/springframework/api/domain/Card.java
new file mode 100755
index 00000000..f4f49ddc
--- /dev/null
+++ b/src/main/java/guru/springframework/api/domain/Card.java
@@ -0,0 +1,67 @@
+
+package guru.springframework.api.domain;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Card implements Serializable
+{
+
+    private String type;
+    private String number;
+    private ExpirationDate expirationDate;
+    private String iban;
+    private String swift;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private final static long serialVersionUID = 6203456183354582742L;
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getNumber() {
+        return number;
+    }
+
+    public void setNumber(String number) {
+        this.number = number;
+    }
+
+    public ExpirationDate getExpirationDate() {
+        return expirationDate;
+    }
+
+    public void setExpirationDate(ExpirationDate expirationDate) {
+        this.expirationDate = expirationDate;
+    }
+
+    public String getIban() {
+        return iban;
+    }
+
+    public void setIban(String iban) {
+        this.iban = iban;
+    }
+
+    public String getSwift() {
+        return swift;
+    }
+
+    public void setSwift(String swift) {
+        this.swift = swift;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}
diff --git a/src/main/java/guru/springframework/api/domain/ExpirationDate.java b/src/main/java/guru/springframework/api/domain/ExpirationDate.java
new file mode 100755
index 00000000..e3109274
--- /dev/null
+++ b/src/main/java/guru/springframework/api/domain/ExpirationDate.java
@@ -0,0 +1,49 @@
+
+package guru.springframework.api.domain;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class ExpirationDate implements Serializable
+{
+
+    private String date;
+    private Integer timezoneType;
+    private String timezone;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private final static long serialVersionUID = 4661228813349752965L;
+
+    public String getDate() {
+        return date;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public Integer getTimezoneType() {
+        return timezoneType;
+    }
+
+    public void setTimezoneType(Integer timezoneType) {
+        this.timezoneType = timezoneType;
+    }
+
+    public String getTimezone() {
+        return timezone;
+    }
+
+    public void setTimezone(String timezone) {
+        this.timezone = timezone;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}
diff --git a/src/main/java/guru/springframework/api/domain/Job.java b/src/main/java/guru/springframework/api/domain/Job.java
new file mode 100755
index 00000000..5ce2654b
--- /dev/null
+++ b/src/main/java/guru/springframework/api/domain/Job.java
@@ -0,0 +1,40 @@
+
+package guru.springframework.api.domain;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Job implements Serializable
+{
+
+    private String title;
+    private String company;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private final static long serialVersionUID = -4985150429002262656L;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}
diff --git a/src/main/java/guru/springframework/api/domain/Location.java b/src/main/java/guru/springframework/api/domain/Location.java
new file mode 100755
index 00000000..569ae65e
--- /dev/null
+++ b/src/main/java/guru/springframework/api/domain/Location.java
@@ -0,0 +1,58 @@
+
+package guru.springframework.api.domain;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Location implements Serializable
+{
+
+    private String street;
+    private String city;
+    private String state;
+    private String postcode;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private final static long serialVersionUID = -3532048267747973846L;
+
+    public String getStreet() {
+        return street;
+    }
+
+    public void setStreet(String street) {
+        this.street = street;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getPostcode() {
+        return postcode;
+    }
+
+    public void setPostcode(String postcode) {
+        this.postcode = postcode;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}
diff --git a/src/main/java/guru/springframework/api/domain/Login.java b/src/main/java/guru/springframework/api/domain/Login.java
new file mode 100755
index 00000000..2dcc8082
--- /dev/null
+++ b/src/main/java/guru/springframework/api/domain/Login.java
@@ -0,0 +1,67 @@
+
+package guru.springframework.api.domain;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Login implements Serializable
+{
+
+    private String username;
+    private String password;
+    private String md5;
+    private String sha1;
+    private String sha256;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private final static long serialVersionUID = 1041720428871730372L;
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getMd5() {
+        return md5;
+    }
+
+    public void setMd5(String md5) {
+        this.md5 = md5;
+    }
+
+    public String getSha1() {
+        return sha1;
+    }
+
+    public void setSha1(String sha1) {
+        this.sha1 = sha1;
+    }
+
+    public String getSha256() {
+        return sha256;
+    }
+
+    public void setSha256(String sha256) {
+        this.sha256 = sha256;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}
diff --git a/src/main/java/guru/springframework/api/domain/Name.java b/src/main/java/guru/springframework/api/domain/Name.java
new file mode 100755
index 00000000..8a2028ed
--- /dev/null
+++ b/src/main/java/guru/springframework/api/domain/Name.java
@@ -0,0 +1,49 @@
+
+package guru.springframework.api.domain;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Name implements Serializable
+{
+
+    private String title;
+    private String first;
+    private String last;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+    private final static long serialVersionUID = 420620315591775395L;
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getFirst() {
+        return first;
+    }
+
+    public void setFirst(String first) {
+        this.first = first;
+    }
+
+    public String getLast() {
+        return last;
+    }
+
+    public void setLast(String last) {
+        this.last = last;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}
diff --git a/src/main/java/guru/springframework/api/domain/User.java b/src/main/java/guru/springframework/api/domain/User.java
new file mode 100755
index 00000000..ab7e1882
--- /dev/null
+++ b/src/main/java/guru/springframework/api/domain/User.java
@@ -0,0 +1,113 @@
+
+package guru.springframework.api.domain;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+public class User implements Serializable
+{
+
+    private String gender;
+    private Name name;
+    private Location location;
+    private String email;
+    private Login login;
+    private String phone;
+    private Job job;
+    private Billing billing;
+    private String language;
+    private String currency;
+    private Map<String, Object> additionalProperties = new HashMap<String, Object>();
+
+    private final static long serialVersionUID = 270727596527329664L;
+
+    public String getGender() {
+        return gender;
+    }
+
+    public void setGender(String gender) {
+        this.gender = gender;
+    }
+
+    public Name getName() {
+        return name;
+    }
+
+    public void setName(Name name) {
+        this.name = name;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public void setLocation(Location location) {
+        this.location = location;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public Login getLogin() {
+        return login;
+    }
+
+    public void setLogin(Login login) {
+        this.login = login;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Job getJob() {
+        return job;
+    }
+
+    public void setJob(Job job) {
+        this.job = job;
+    }
+
+    public Billing getBilling() {
+        return billing;
+    }
+
+    public void setBilling(Billing billing) {
+        this.billing = billing;
+    }
+
+    public String getLanguage() {
+        return language;
+    }
+
+    public void setLanguage(String language) {
+        this.language = language;
+    }
+
+    public String getCurrency() {
+        return currency;
+    }
+
+    public void setCurrency(String currency) {
+        this.currency = currency;
+    }
+
+    public Map<String, Object> getAdditionalProperties() {
+        return this.additionalProperties;
+    }
+
+    public void setAdditionalProperty(String name, Object value) {
+        this.additionalProperties.put(name, value);
+    }
+
+}