diff --git a/api/handler.go b/api/handler.go
index 2db340b..3a920d4 100644
--- a/api/handler.go
+++ b/api/handler.go
@@ -17,58 +17,58 @@ var (
 func Handler() *mux.Router {
 	m := router.API()
 
-	m.Get(router.User).Handler(handler(serveUser))
-	m.Get(router.CreateUser).Handler(handler(serveCreateUser))
-	m.Get(router.Users).Handler(handler(serveUsers))
+	m.Get(router.User).Handler(authHandler(serveUser))
+	m.Get(router.CreateUser).Handler(authHandler(serveCreateUser))
+	m.Get(router.Users).Handler(authHandler(serveUsers))
 	m.Get(router.GetToken).Handler(handler(serveAuthenticateUser))
 
 	m.Get(router.Genus).Handler(authHandler(serveGenus))
-	m.Get(router.CreateGenus).Handler(handler(serveCreateGenus))
-	m.Get(router.Genera).Handler(handler(serveGenera))
-	m.Get(router.UpdateGenus).Handler(handler(serveUpdateGenus))
-	m.Get(router.DeleteGenus).Handler(handler(serveDeleteGenus))
+	m.Get(router.CreateGenus).Handler(authHandler(serveCreateGenus))
+	m.Get(router.Genera).Handler(authHandler(serveGenera))
+	m.Get(router.UpdateGenus).Handler(authHandler(serveUpdateGenus))
+	m.Get(router.DeleteGenus).Handler(authHandler(serveDeleteGenus))
 
-	m.Get(router.Species).Handler(handler(serveSpecies))
-	m.Get(router.CreateSpecies).Handler(handler(serveCreateSpecies))
-	m.Get(router.SpeciesList).Handler(handler(serveSpeciesList))
-	m.Get(router.UpdateSpecies).Handler(handler(serveUpdateSpecies))
-	m.Get(router.DeleteSpecies).Handler(handler(serveDeleteSpecies))
+	m.Get(router.Species).Handler(authHandler(serveSpecies))
+	m.Get(router.CreateSpecies).Handler(authHandler(serveCreateSpecies))
+	m.Get(router.SpeciesList).Handler(authHandler(serveSpeciesList))
+	m.Get(router.UpdateSpecies).Handler(authHandler(serveUpdateSpecies))
+	m.Get(router.DeleteSpecies).Handler(authHandler(serveDeleteSpecies))
 
-	m.Get(router.Strain).Handler(handler(serveStrain))
-	m.Get(router.CreateStrain).Handler(handler(serveCreateStrain))
-	m.Get(router.Strains).Handler(handler(serveStrainList))
-	m.Get(router.UpdateStrain).Handler(handler(serveUpdateStrain))
-	m.Get(router.DeleteStrain).Handler(handler(serveDeleteStrain))
+	m.Get(router.Strain).Handler(authHandler(serveStrain))
+	m.Get(router.CreateStrain).Handler(authHandler(serveCreateStrain))
+	m.Get(router.Strains).Handler(authHandler(serveStrainList))
+	m.Get(router.UpdateStrain).Handler(authHandler(serveUpdateStrain))
+	m.Get(router.DeleteStrain).Handler(authHandler(serveDeleteStrain))
 
-	m.Get(router.CharacteristicType).Handler(handler(serveCharacteristicType))
-	m.Get(router.CreateCharacteristicType).Handler(handler(serveCreateCharacteristicType))
-	m.Get(router.CharacteristicTypes).Handler(handler(serveCharacteristicTypeList))
-	m.Get(router.UpdateCharacteristicType).Handler(handler(serveUpdateCharacteristicType))
-	m.Get(router.DeleteCharacteristicType).Handler(handler(serveDeleteCharacteristicType))
+	m.Get(router.CharacteristicType).Handler(authHandler(serveCharacteristicType))
+	m.Get(router.CreateCharacteristicType).Handler(authHandler(serveCreateCharacteristicType))
+	m.Get(router.CharacteristicTypes).Handler(authHandler(serveCharacteristicTypeList))
+	m.Get(router.UpdateCharacteristicType).Handler(authHandler(serveUpdateCharacteristicType))
+	m.Get(router.DeleteCharacteristicType).Handler(authHandler(serveDeleteCharacteristicType))
 
-	m.Get(router.Characteristic).Handler(handler(serveCharacteristic))
-	m.Get(router.CreateCharacteristic).Handler(handler(serveCreateCharacteristic))
-	m.Get(router.Characteristics).Handler(handler(serveCharacteristicList))
-	m.Get(router.UpdateCharacteristic).Handler(handler(serveUpdateCharacteristic))
-	m.Get(router.DeleteCharacteristic).Handler(handler(serveDeleteCharacteristic))
+	m.Get(router.Characteristic).Handler(authHandler(serveCharacteristic))
+	m.Get(router.CreateCharacteristic).Handler(authHandler(serveCreateCharacteristic))
+	m.Get(router.Characteristics).Handler(authHandler(serveCharacteristicList))
+	m.Get(router.UpdateCharacteristic).Handler(authHandler(serveUpdateCharacteristic))
+	m.Get(router.DeleteCharacteristic).Handler(authHandler(serveDeleteCharacteristic))
 
-	m.Get(router.TextMeasurementType).Handler(handler(serveTextMeasurementType))
-	m.Get(router.CreateTextMeasurementType).Handler(handler(serveCreateTextMeasurementType))
-	m.Get(router.TextMeasurementTypes).Handler(handler(serveTextMeasurementTypeList))
-	m.Get(router.UpdateTextMeasurementType).Handler(handler(serveUpdateTextMeasurementType))
-	m.Get(router.DeleteTextMeasurementType).Handler(handler(serveDeleteTextMeasurementType))
+	m.Get(router.TextMeasurementType).Handler(authHandler(serveTextMeasurementType))
+	m.Get(router.CreateTextMeasurementType).Handler(authHandler(serveCreateTextMeasurementType))
+	m.Get(router.TextMeasurementTypes).Handler(authHandler(serveTextMeasurementTypeList))
+	m.Get(router.UpdateTextMeasurementType).Handler(authHandler(serveUpdateTextMeasurementType))
+	m.Get(router.DeleteTextMeasurementType).Handler(authHandler(serveDeleteTextMeasurementType))
 
-	m.Get(router.UnitType).Handler(handler(serveUnitType))
-	m.Get(router.CreateUnitType).Handler(handler(serveCreateUnitType))
-	m.Get(router.UnitTypes).Handler(handler(serveUnitTypeList))
-	m.Get(router.UpdateUnitType).Handler(handler(serveUpdateUnitType))
-	m.Get(router.DeleteUnitType).Handler(handler(serveDeleteUnitType))
+	m.Get(router.UnitType).Handler(authHandler(serveUnitType))
+	m.Get(router.CreateUnitType).Handler(authHandler(serveCreateUnitType))
+	m.Get(router.UnitTypes).Handler(authHandler(serveUnitTypeList))
+	m.Get(router.UpdateUnitType).Handler(authHandler(serveUpdateUnitType))
+	m.Get(router.DeleteUnitType).Handler(authHandler(serveDeleteUnitType))
 
-	m.Get(router.Measurement).Handler(handler(serveMeasurement))
-	m.Get(router.CreateMeasurement).Handler(handler(serveCreateMeasurement))
-	m.Get(router.Measurements).Handler(handler(serveMeasurementList))
-	m.Get(router.UpdateMeasurement).Handler(handler(serveUpdateMeasurement))
-	m.Get(router.DeleteMeasurement).Handler(handler(serveDeleteMeasurement))
+	m.Get(router.Measurement).Handler(authHandler(serveMeasurement))
+	m.Get(router.CreateMeasurement).Handler(authHandler(serveCreateMeasurement))
+	m.Get(router.Measurements).Handler(authHandler(serveMeasurementList))
+	m.Get(router.UpdateMeasurement).Handler(authHandler(serveUpdateMeasurement))
+	m.Get(router.DeleteMeasurement).Handler(authHandler(serveDeleteMeasurement))
 
 	m.Get(router.SubrouterListSpecies).Handler(authHandler(serveSubrouterSpeciesList))
 	m.Get(router.SubrouterListStrains).Handler(authHandler(serveSubrouterStrainsList))