Removed enum to have a compability with java 8