thingsboard-developers

diff --git a/application/src/main/java/org/thingsboard/server/config/JwtSettings.java b/application/src/main/java/org/thingsboard/server/config/JwtSettings.java
new file mode 100644
index 0000000..9a74785
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/config/JwtSettings.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.config;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.thingsboard.server.service.security.model.token.JwtToken;
+
+@Configuration
+@ConfigurationProperties(prefix = "security.jwt")
+public class JwtSettings {
+    /**
+     * {@link JwtToken} will expire after this time.
+     */
+    private Integer tokenExpirationTime;
+
+    /**
+     * Token issuer.
+     */
+    private String tokenIssuer;
+
+    /**
+     * Key is used to sign {@link JwtToken}.
+     */
+    private String tokenSigningKey;
+
+    /**
+     * {@link JwtToken} can be refreshed during this timeframe.
+     */
+    private Integer refreshTokenExpTime;
+
+    public Integer getRefreshTokenExpTime() {
+        return refreshTokenExpTime;
+    }
+
+    public void setRefreshTokenExpTime(Integer refreshTokenExpTime) {
+        this.refreshTokenExpTime = refreshTokenExpTime;
+    }
+
+    public Integer getTokenExpirationTime() {
+        return tokenExpirationTime;
+    }
+
+    public void setTokenExpirationTime(Integer tokenExpirationTime) {
+        this.tokenExpirationTime = tokenExpirationTime;
+    }
+
+    public String getTokenIssuer() {
+        return tokenIssuer;
+    }
+    public void setTokenIssuer(String tokenIssuer) {
+        this.tokenIssuer = tokenIssuer;
+    }
+
+    public String getTokenSigningKey() {
+        return tokenSigningKey;
+    }
+
+    public void setTokenSigningKey(String tokenSigningKey) {
+        this.tokenSigningKey = tokenSigningKey;
+    }
+}
\ No newline at end of file

diff --git a/application/src/main/java/org/thingsboard/server/config/ThingsboardMessageConfiguration.java b/application/src/main/java/org/thingsboard/server/config/ThingsboardMessageConfiguration.java
new file mode 100644
index 0000000..99bec5b
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/config/ThingsboardMessageConfiguration.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.config;
+
+import org.springframework.context.MessageSource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ResourceBundleMessageSource;
+
+@Configuration
+public class ThingsboardMessageConfiguration {
+
+    @Bean
+    public MessageSource messageSource() {
+        ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
+        messageSource.setBasename("i18n/messages");
+        messageSource.setDefaultEncoding("UTF-8");
+        return messageSource;
+    }
+    
+}

diff --git a/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
new file mode 100644
index 0000000..ec6ca81
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/config/ThingsboardSecurityConfiguration.java
@@ -0,0 +1,161 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.security.SecurityProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.thingsboard.server.exception.ThingsboardErrorResponseHandler;
+import org.thingsboard.server.service.security.auth.rest.RestAuthenticationProvider;
+import org.thingsboard.server.service.security.auth.rest.RestLoginProcessingFilter;
+import org.thingsboard.server.service.security.auth.jwt.*;
+import org.thingsboard.server.service.security.auth.jwt.extractor.TokenExtractor;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Configuration
+@EnableWebSecurity
+@EnableGlobalMethodSecurity(prePostEnabled=true)
+@Order(SecurityProperties.ACCESS_OVERRIDE_ORDER)
+public class ThingsboardSecurityConfiguration extends WebSecurityConfigurerAdapter {
+
+    public static final String JWT_TOKEN_HEADER_PARAM = "X-Authorization";
+    public static final String JWT_TOKEN_QUERY_PARAM = "token";
+
+    public static final String DEVICE_API_ENTRY_POINT = "/api/v1/**";
+    public static final String FORM_BASED_LOGIN_ENTRY_POINT = "/api/auth/login";
+    public static final String TOKEN_REFRESH_ENTRY_POINT = "/api/auth/token";
+    public static final String[] NON_TOKEN_BASED_AUTH_ENTRY_POINTS = new String[] {"/index.html", "/static/**", "/api/noauth/**"};
+    public static final String TOKEN_BASED_AUTH_ENTRY_POINT = "/api/**";
+    public static final String WS_TOKEN_BASED_AUTH_ENTRY_POINT = "/api/ws/**";
+
+    @Autowired private ThingsboardErrorResponseHandler restAccessDeniedHandler;
+    @Autowired private AuthenticationSuccessHandler successHandler;
+    @Autowired private AuthenticationFailureHandler failureHandler;
+    @Autowired private RestAuthenticationProvider restAuthenticationProvider;
+    @Autowired private JwtAuthenticationProvider jwtAuthenticationProvider;
+    @Autowired private RefreshTokenAuthenticationProvider refreshTokenAuthenticationProvider;
+
+    @Autowired
+    @Qualifier("jwtHeaderTokenExtractor")
+    private TokenExtractor jwtHeaderTokenExtractor;
+
+    @Autowired
+    @Qualifier("jwtQueryTokenExtractor")
+    private TokenExtractor jwtQueryTokenExtractor;
+
+    @Autowired private AuthenticationManager authenticationManager;
+
+    @Autowired private ObjectMapper objectMapper;
+
+    @Bean
+    protected RestLoginProcessingFilter buildRestLoginProcessingFilter() throws Exception {
+        RestLoginProcessingFilter filter = new RestLoginProcessingFilter(FORM_BASED_LOGIN_ENTRY_POINT, successHandler, failureHandler, objectMapper);
+        filter.setAuthenticationManager(this.authenticationManager);
+        return filter;
+    }
+
+    @Bean
+    protected JwtTokenAuthenticationProcessingFilter buildJwtTokenAuthenticationProcessingFilter() throws Exception {
+        List<String> pathsToSkip = new ArrayList(Arrays.asList(NON_TOKEN_BASED_AUTH_ENTRY_POINTS));
+        pathsToSkip.addAll(Arrays.asList(WS_TOKEN_BASED_AUTH_ENTRY_POINT, TOKEN_REFRESH_ENTRY_POINT, FORM_BASED_LOGIN_ENTRY_POINT, DEVICE_API_ENTRY_POINT));
+        SkipPathRequestMatcher matcher = new SkipPathRequestMatcher(pathsToSkip, TOKEN_BASED_AUTH_ENTRY_POINT);
+        JwtTokenAuthenticationProcessingFilter filter
+                = new JwtTokenAuthenticationProcessingFilter(failureHandler, jwtHeaderTokenExtractor, matcher);
+        filter.setAuthenticationManager(this.authenticationManager);
+        return filter;
+    }
+
+    @Bean
+    protected RefreshTokenProcessingFilter buildRefreshTokenProcessingFilter() throws Exception {
+        RefreshTokenProcessingFilter filter = new RefreshTokenProcessingFilter(TOKEN_REFRESH_ENTRY_POINT, successHandler, failureHandler, objectMapper);
+        filter.setAuthenticationManager(this.authenticationManager);
+        return filter;
+    }
+
+    @Bean
+    protected JwtTokenAuthenticationProcessingFilter buildWsJwtTokenAuthenticationProcessingFilter() throws Exception {
+        AntPathRequestMatcher matcher = new AntPathRequestMatcher(WS_TOKEN_BASED_AUTH_ENTRY_POINT);
+        JwtTokenAuthenticationProcessingFilter filter
+                = new JwtTokenAuthenticationProcessingFilter(failureHandler, jwtQueryTokenExtractor, matcher);
+        filter.setAuthenticationManager(this.authenticationManager);
+        return filter;
+    }
+
+    @Bean
+    @Override
+    public AuthenticationManager authenticationManagerBean() throws Exception {
+        return super.authenticationManagerBean();
+    }
+
+    @Override
+    protected void configure(AuthenticationManagerBuilder auth) {
+        auth.authenticationProvider(restAuthenticationProvider);
+        auth.authenticationProvider(jwtAuthenticationProvider);
+        auth.authenticationProvider(refreshTokenAuthenticationProvider);
+    }
+
+    @Bean
+    protected BCryptPasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.headers().frameOptions().disable()
+                .and()
+                .csrf().disable()
+                .exceptionHandling()
+                .and()
+                .sessionManagement()
+                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                .and()
+                .authorizeRequests()
+                .antMatchers(DEVICE_API_ENTRY_POINT).permitAll() // Device HTTP Transport API
+                .antMatchers(FORM_BASED_LOGIN_ENTRY_POINT).permitAll() // Login end-point
+                .antMatchers(TOKEN_REFRESH_ENTRY_POINT).permitAll() // Token refresh end-point
+                .antMatchers(NON_TOKEN_BASED_AUTH_ENTRY_POINTS).permitAll() // static resources, user activation and password reset end-points
+                .and()
+                .authorizeRequests()
+                .antMatchers(WS_TOKEN_BASED_AUTH_ENTRY_POINT).authenticated() // Protected WebSocket API End-points
+                .antMatchers(TOKEN_BASED_AUTH_ENTRY_POINT).authenticated() // Protected API End-points
+                .and()
+                .exceptionHandling().accessDeniedHandler(restAccessDeniedHandler)
+                .and()
+                .addFilterBefore(buildRestLoginProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
+                .addFilterBefore(buildJwtTokenAuthenticationProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
+                .addFilterBefore(buildRefreshTokenProcessingFilter(), UsernamePasswordAuthenticationFilter.class)
+                .addFilterBefore(buildWsJwtTokenAuthenticationProcessingFilter(), UsernamePasswordAuthenticationFilter.class);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/config/WebConfig.java b/application/src/main/java/org/thingsboard/server/config/WebConfig.java
new file mode 100644
index 0000000..3a2234a
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/config/WebConfig.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.config;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+public class WebConfig {
+
+    @RequestMapping(value = "/{path:^(?!api$)(?!static$)[^\\.]*}/**")
+    public String redirect() {
+        return "forward:/index.html";
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java
new file mode 100644
index 0000000..b6b4d0e
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/config/WebSocketConfiguration.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.config;
+
+import java.util.Map;
+
+import org.thingsboard.server.exception.ThingsboardErrorCode;
+import org.thingsboard.server.exception.ThingsboardException;
+import org.thingsboard.server.controller.plugin.PluginWebSocketHandler;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.server.ServerHttpRequest;
+import org.springframework.http.server.ServerHttpResponse;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.socket.WebSocketHandler;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.config.annotation.WebSocketConfigurer;
+import org.springframework.web.socket.config.annotation.WebSocketHandlerRegistry;
+import org.springframework.web.socket.server.HandshakeInterceptor;
+import org.springframework.web.socket.server.standard.ServletServerContainerFactoryBean;
+import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;
+
+@Configuration
+@EnableWebSocket
+public class WebSocketConfiguration implements WebSocketConfigurer {
+
+    public static final String WS_PLUGIN_PREFIX = "/api/ws/plugins/";
+    public static final String WS_SECURITY_USER_ATTRIBUTE = "SECURITY_USER";
+    private static final String WS_PLUGIN_MAPPING = WS_PLUGIN_PREFIX + "**";
+
+    @Bean
+    public ServletServerContainerFactoryBean createWebSocketContainer() {
+        ServletServerContainerFactoryBean container = new ServletServerContainerFactoryBean();
+        container.setMaxTextMessageBufferSize(8192);
+        container.setMaxBinaryMessageBufferSize(8192);
+        return container;
+    }
+
+    @Override
+    public void registerWebSocketHandlers(WebSocketHandlerRegistry registry) {
+        registry.addHandler(pluginWsHandler(), WS_PLUGIN_MAPPING).setAllowedOrigins("*")
+                .addInterceptors(new HttpSessionHandshakeInterceptor(), new HandshakeInterceptor() {
+
+                    @Override
+                    public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler,
+                            Map<String, Object> attributes) throws Exception {
+                        SecurityUser user = null;
+                        try {
+                            user = getCurrentUser();
+                        } catch (ThingsboardException ex) {}
+                        if (user == null) {
+                            response.setStatusCode(HttpStatus.UNAUTHORIZED);
+                            return false;
+                        } else {
+                            attributes.put(WS_SECURITY_USER_ATTRIBUTE, user);
+                            return true;
+                        }
+                    }
+
+                    @Override
+                    public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler,
+                            Exception exception) {
+                    }
+                });
+    }
+
+    @Bean
+    public WebSocketHandler pluginWsHandler() {
+        return new PluginWebSocketHandler();
+    }
+
+    protected SecurityUser getCurrentUser() throws ThingsboardException {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
+            return (SecurityUser) authentication.getPrincipal();
+        } else {
+            throw new ThingsboardException("You aren't authorized to perform this operation!", ThingsboardErrorCode.AUTHENTICATION);
+        }
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/AdminController.java b/application/src/main/java/org/thingsboard/server/controller/AdminController.java
new file mode 100644
index 0000000..cace783
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/AdminController.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.dao.settings.AdminSettingsService;
+import org.thingsboard.server.exception.ThingsboardException;
+import org.thingsboard.server.service.mail.MailService;
+
+@RestController
+@RequestMapping("/api/admin")
+public class AdminController extends BaseController {
+
+    @Autowired
+    private MailService mailService;
+    
+    @Autowired
+    private AdminSettingsService adminSettingsService;
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/settings/{key}", method = RequestMethod.GET)
+    @ResponseBody
+    public AdminSettings getAdminSettings(@PathVariable("key") String key) throws ThingsboardException {
+        try {
+            return checkNotNull(adminSettingsService.findAdminSettingsByKey(key));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/settings", method = RequestMethod.POST)
+    @ResponseBody 
+    public AdminSettings saveAdminSettings(@RequestBody AdminSettings adminSettings) throws ThingsboardException {
+        try {
+            adminSettings = checkNotNull(adminSettingsService.saveAdminSettings(adminSettings));
+            if (adminSettings.getKey().equals("mail")) {
+                mailService.updateMailConfiguration();
+            }
+            return adminSettings;
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/settings/testMail", method = RequestMethod.POST)
+    public void sendTestMail(@RequestBody AdminSettings adminSettings) throws ThingsboardException {
+        try {
+            adminSettings = checkNotNull(adminSettings);
+            if (adminSettings.getKey().equals("mail")) {
+               String email = getCurrentUser().getEmail();
+               mailService.sendTestMail(adminSettings.getJsonValue(), email);
+            }
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/AuthController.java b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
new file mode 100644
index 0000000..b704c86
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/AuthController.java
@@ -0,0 +1,236 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.exception.ThingsboardErrorCode;
+import org.thingsboard.server.exception.ThingsboardException;
+import org.thingsboard.server.service.mail.MailService;
+import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRepository;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.token.JwtToken;
+import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
+
+import javax.servlet.http.HttpServletRequest;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+@RestController
+@RequestMapping("/api")
+@Slf4j
+public class AuthController extends BaseController {
+
+
+
+    @Autowired
+    private BCryptPasswordEncoder passwordEncoder;
+
+    @Autowired
+    private JwtTokenFactory tokenFactory;
+
+    @Autowired
+    private RefreshTokenRepository refreshTokenRepository;
+
+    @Autowired
+    private UserService userService;
+
+    @Autowired
+    private MailService mailService;
+
+    @PreAuthorize("isAuthenticated()")
+    @RequestMapping(value = "/auth/user", method = RequestMethod.GET)
+    public @ResponseBody User getUser() throws ThingsboardException {
+        try {
+            SecurityUser securityUser = getCurrentUser();
+            return userService.findUserById(securityUser.getId());
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("isAuthenticated()")
+    @RequestMapping(value = "/auth/changePassword", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void changePassword (
+            @RequestParam(value = "currentPassword") String currentPassword,
+            @RequestParam(value = "newPassword") String newPassword) throws ThingsboardException {
+        try {
+            SecurityUser securityUser = getCurrentUser();
+            UserCredentials userCredentials = userService.findUserCredentialsByUserId(securityUser.getId());
+            if (!passwordEncoder.matches(currentPassword, userCredentials.getPassword())) {
+                throw new ThingsboardException("Current password doesn't match!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            }
+            userCredentials.setPassword(passwordEncoder.encode(newPassword));
+            userService.saveUserCredentials(userCredentials);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+    
+    @RequestMapping(value = "/noauth/activate", params = { "activateToken" }, method = RequestMethod.GET)
+    public ResponseEntity<String> checkActivateToken(
+            @RequestParam(value = "activateToken") String activateToken) {
+        HttpHeaders headers = new HttpHeaders();
+        HttpStatus responseStatus;
+        UserCredentials userCredentials = userService.findUserCredentialsByActivateToken(activateToken);
+        if (userCredentials != null) {
+            String createPasswordURI = "/login/createPassword";
+            try {
+                URI location = new URI(createPasswordURI + "?activateToken=" + activateToken);
+                headers.setLocation(location);
+                responseStatus = HttpStatus.PERMANENT_REDIRECT;
+            } catch (URISyntaxException e) {
+                log.error("Unable to create URI with address [{}]", createPasswordURI);
+                responseStatus = HttpStatus.BAD_REQUEST;
+            }
+        } else {
+            responseStatus = HttpStatus.CONFLICT;
+        }
+        return new ResponseEntity<>(headers, responseStatus);
+    }
+    
+    @RequestMapping(value = "/noauth/resetPasswordByEmail", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void requestResetPasswordByEmail (
+            @RequestParam(value = "email") String email,
+            HttpServletRequest request) throws ThingsboardException {
+        try {
+            UserCredentials userCredentials = userService.requestPasswordReset(email);
+            
+            String baseUrl = String.format("%s://%s:%d",
+                    request.getScheme(),  
+                    request.getServerName(), 
+                    request.getServerPort());             
+            String resetPasswordUrl = String.format("%s/api/noauth/resetPassword?resetToken=%s", baseUrl,
+                    userCredentials.getResetToken());
+            
+            mailService.sendResetPasswordEmail(resetPasswordUrl, email);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+    
+    @RequestMapping(value = "/noauth/resetPassword", params = { "resetToken" }, method = RequestMethod.GET)
+    public ResponseEntity<String> checkResetToken(
+            @RequestParam(value = "resetToken") String resetToken) {
+        HttpHeaders headers = new HttpHeaders();
+        HttpStatus responseStatus;
+        String resetPasswordURI = "/login/resetPassword";
+        UserCredentials userCredentials = userService.findUserCredentialsByResetToken(resetToken);
+        if (userCredentials != null) {
+            try {
+                URI location = new URI(resetPasswordURI + "?resetToken=" + resetToken);
+                headers.setLocation(location);
+                responseStatus = HttpStatus.PERMANENT_REDIRECT;
+            } catch (URISyntaxException e) {
+                log.error("Unable to create URI with address [{}]", resetPasswordURI);
+                responseStatus = HttpStatus.BAD_REQUEST;
+            }
+        } else {
+            responseStatus = HttpStatus.CONFLICT;
+        }
+        return new ResponseEntity<>(headers, responseStatus);
+    }
+    
+    @RequestMapping(value = "/noauth/activate", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    @ResponseBody
+    public JsonNode activateUser(
+            @RequestParam(value = "activateToken") String activateToken,
+            @RequestParam(value = "password") String password,
+            HttpServletRequest request) throws ThingsboardException {
+        try {
+            String encodedPassword = passwordEncoder.encode(password);
+            UserCredentials credentials = userService.activateUserCredentials(activateToken, encodedPassword);
+            User user = userService.findUserById(credentials.getUserId());
+            SecurityUser securityUser = new SecurityUser(user, credentials.isEnabled());
+            String baseUrl = String.format("%s://%s:%d",
+                    request.getScheme(),  
+                    request.getServerName(), 
+                    request.getServerPort());             
+            String loginUrl = String.format("%s/login", baseUrl);
+            String email = user.getEmail();
+            mailService.sendAccountActivatedEmail(loginUrl, email);
+
+            JwtToken accessToken = tokenFactory.createAccessJwtToken(securityUser);
+            JwtToken refreshToken = refreshTokenRepository.requestRefreshToken(securityUser);
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            ObjectNode tokenObject = objectMapper.createObjectNode();
+            tokenObject.put("token", accessToken.getToken());
+            tokenObject.put("refreshToken", refreshToken.getToken());
+            return tokenObject;
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+    
+    @RequestMapping(value = "/noauth/resetPassword", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    @ResponseBody
+    public JsonNode resetPassword(
+            @RequestParam(value = "resetToken") String resetToken,
+            @RequestParam(value = "password") String password,
+            HttpServletRequest request) throws ThingsboardException {
+        try {
+            UserCredentials userCredentials = userService.findUserCredentialsByResetToken(resetToken);
+            if (userCredentials != null) {
+                String encodedPassword = passwordEncoder.encode(password);
+                userCredentials.setPassword(encodedPassword);
+                userCredentials.setResetToken(null);
+                userCredentials = userService.saveUserCredentials(userCredentials);
+                User user = userService.findUserById(userCredentials.getUserId());
+                SecurityUser securityUser = new SecurityUser(user, userCredentials.isEnabled());
+                String baseUrl = String.format("%s://%s:%d",
+                        request.getScheme(),  
+                        request.getServerName(), 
+                        request.getServerPort());             
+                String loginUrl = String.format("%s/login", baseUrl);
+                String email = user.getEmail();
+                mailService.sendPasswordWasResetEmail(loginUrl, email);
+
+                JwtToken accessToken = tokenFactory.createAccessJwtToken(securityUser);
+                JwtToken refreshToken = refreshTokenRepository.requestRefreshToken(securityUser);
+
+                ObjectMapper objectMapper = new ObjectMapper();
+                ObjectNode tokenObject = objectMapper.createObjectNode();
+                tokenObject.put("token", accessToken.getToken());
+                tokenObject.put("refreshToken", refreshToken.getToken());
+                return tokenObject;
+            } else {
+                throw new ThingsboardException("Invalid reset token!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            }
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/BaseController.java b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
new file mode 100644
index 0000000..db6380b
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/BaseController.java
@@ -0,0 +1,377 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.thingsboard.server.actors.service.ActorService;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.*;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.dao.dashboard.DashboardService;
+import org.thingsboard.server.dao.device.DeviceCredentialsService;
+import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.plugin.PluginService;
+import org.thingsboard.server.dao.rule.RuleService;
+import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.widget.WidgetTypeService;
+import org.thingsboard.server.dao.widget.WidgetsBundleService;
+import org.thingsboard.server.exception.ThingsboardErrorCode;
+import org.thingsboard.server.exception.ThingsboardErrorResponseHandler;
+import org.thingsboard.server.exception.ThingsboardException;
+import org.thingsboard.server.service.component.ComponentDiscoveryService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+import javax.mail.MessagingException;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import static org.thingsboard.server.dao.service.Validator.validateId;
+
+@Slf4j
+public abstract class BaseController {
+
+    @Autowired
+    private ThingsboardErrorResponseHandler errorResponseHandler;
+
+    @Autowired
+    protected CustomerService customerService;
+
+    @Autowired
+    protected UserService userService;
+
+    @Autowired
+    protected DeviceService deviceService;
+
+    @Autowired
+    protected DeviceCredentialsService deviceCredentialsService;
+
+    @Autowired
+    protected WidgetsBundleService widgetsBundleService;
+
+    @Autowired
+    protected WidgetTypeService widgetTypeService;
+
+    @Autowired
+    protected DashboardService dashboardService;
+
+    @Autowired
+    protected ComponentDiscoveryService componentDescriptorService;
+
+    @Autowired
+    protected RuleService ruleService;
+
+    @Autowired
+    protected PluginService pluginService;
+
+    @Autowired
+    protected ActorService actorService;
+
+
+    @ExceptionHandler(ThingsboardException.class)
+    public void handleThingsboardException(ThingsboardException ex, HttpServletResponse response) {
+        errorResponseHandler.handle(ex, response);
+    }
+
+    ThingsboardException handleException(Exception exception) {
+        return handleException(exception, true);
+    }
+
+    private ThingsboardException handleException(Exception exception, boolean logException) {
+        if (logException) {
+            log.error("Error [{}]", exception.getMessage());
+        }
+
+        String cause = "";
+        if (exception.getCause() != null) {
+            cause = exception.getCause().getClass().getCanonicalName();
+        }
+
+        if (exception instanceof ThingsboardException) {
+            return (ThingsboardException) exception;
+        } else if (exception instanceof IllegalArgumentException || exception instanceof IncorrectParameterException
+                || exception instanceof DataValidationException || cause.contains("IncorrectParameterException")) {
+            return new ThingsboardException(exception.getMessage(), ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        } else if (exception instanceof MessagingException) {
+            return new ThingsboardException("Unable to send mail: " + exception.getMessage(), ThingsboardErrorCode.GENERAL);
+        } else {
+            return new ThingsboardException(exception.getMessage(), ThingsboardErrorCode.GENERAL);
+        }
+    }
+
+    <T> T checkNotNull(T reference) throws ThingsboardException {
+        if (reference == null) {
+            throw new ThingsboardException("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND);
+        }
+        return reference;
+    }
+
+    <T> T checkNotNull(Optional<T> reference) throws ThingsboardException {
+        if (reference.isPresent()) {
+            return reference.get();
+        } else {
+            throw new ThingsboardException("Requested item wasn't found!", ThingsboardErrorCode.ITEM_NOT_FOUND);
+        }
+    }
+
+    void checkParameter(String name, String param) throws ThingsboardException {
+        if (StringUtils.isEmpty(param)) {
+            throw new ThingsboardException("Parameter '" + name + "' can't be empty!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+    }
+
+    UUID toUUID(String id) {
+        return UUID.fromString(id);
+    }
+
+    TimePageLink createPageLink(int limit, Long startTime, Long endTime, boolean ascOrder, String idOffset) {
+        UUID idOffsetUuid = null;
+        if (StringUtils.isNotEmpty(idOffset)) {
+            idOffsetUuid = toUUID(idOffset);
+        }
+        return new TimePageLink(limit, startTime, endTime, ascOrder, idOffsetUuid);
+    }
+
+
+    TextPageLink createPageLink(int limit, String textSearch, String idOffset, String textOffset) {
+        UUID idOffsetUuid = null;
+        if (StringUtils.isNotEmpty(idOffset)) {
+            idOffsetUuid = toUUID(idOffset);
+        }
+        return new TextPageLink(limit, textSearch, idOffsetUuid, textOffset);
+    }
+
+    protected SecurityUser getCurrentUser() throws ThingsboardException {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication != null && authentication.getPrincipal() instanceof SecurityUser) {
+            return (SecurityUser) authentication.getPrincipal();
+        } else {
+            throw new ThingsboardException("You aren't authorized to perform this operation!", ThingsboardErrorCode.AUTHENTICATION);
+        }
+    }
+
+    void checkTenantId(TenantId tenantId) throws ThingsboardException {
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        SecurityUser authUser = getCurrentUser();
+        if (authUser.getAuthority() != Authority.SYS_ADMIN &&
+                (authUser.getTenantId() == null || !authUser.getTenantId().equals(tenantId))) {
+            throw new ThingsboardException("You don't have permission to perform this operation!",
+                    ThingsboardErrorCode.PERMISSION_DENIED);
+        }
+    }
+
+    protected TenantId getTenantId() throws ThingsboardException {
+        return getCurrentUser().getTenantId();
+    }
+
+    Customer checkCustomerId(CustomerId customerId) throws ThingsboardException {
+        try {
+            validateId(customerId, "Incorrect customerId " + customerId);
+            SecurityUser authUser = getCurrentUser();
+            if (authUser.getAuthority() == Authority.SYS_ADMIN ||
+                    (authUser.getAuthority() != Authority.TENANT_ADMIN &&
+                            (authUser.getCustomerId() == null || !authUser.getCustomerId().equals(customerId)))) {
+                throw new ThingsboardException("You don't have permission to perform this operation!",
+                        ThingsboardErrorCode.PERMISSION_DENIED);
+            }
+            Customer customer = customerService.findCustomerById(customerId);
+            checkCustomer(customer);
+            return customer;
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    private void checkCustomer(Customer customer) throws ThingsboardException {
+        checkNotNull(customer);
+        checkTenantId(customer.getTenantId());
+    }
+
+    User checkUserId(UserId userId) throws ThingsboardException {
+        try {
+            validateId(userId, "Incorrect userId " + userId);
+            User user = userService.findUserById(userId);
+            checkUser(user);
+            return user;
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    private void checkUser(User user) throws ThingsboardException {
+        checkNotNull(user);
+        checkTenantId(user.getTenantId());
+        if (user.getAuthority() == Authority.CUSTOMER_USER) {
+            checkCustomerId(user.getCustomerId());
+        }
+    }
+
+    Device checkDeviceId(DeviceId deviceId) throws ThingsboardException {
+        try {
+            validateId(deviceId, "Incorrect deviceId " + deviceId);
+            Device device = deviceService.findDeviceById(deviceId);
+            checkDevice(device);
+            return device;
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    private void checkDevice(Device device) throws ThingsboardException {
+        checkNotNull(device);
+        checkTenantId(device.getTenantId());
+        if (device.getCustomerId() != null && !device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
+            checkCustomerId(device.getCustomerId());
+        }
+    }
+
+    WidgetsBundle checkWidgetsBundleId(WidgetsBundleId widgetsBundleId, boolean modify) throws ThingsboardException {
+        try {
+            validateId(widgetsBundleId, "Incorrect widgetsBundleId " + widgetsBundleId);
+            WidgetsBundle widgetsBundle = widgetsBundleService.findWidgetsBundleById(widgetsBundleId);
+            checkWidgetsBundle(widgetsBundle, modify);
+            return widgetsBundle;
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    private void checkWidgetsBundle(WidgetsBundle widgetsBundle, boolean modify) throws ThingsboardException {
+        checkNotNull(widgetsBundle);
+        if (widgetsBundle.getTenantId() != null && !widgetsBundle.getTenantId().getId().equals(ModelConstants.NULL_UUID)) {
+            checkTenantId(widgetsBundle.getTenantId());
+        } else if (modify && getCurrentUser().getAuthority() != Authority.SYS_ADMIN) {
+            throw new ThingsboardException("You don't have permission to perform this operation!",
+                    ThingsboardErrorCode.PERMISSION_DENIED);
+        }
+    }
+
+    WidgetType checkWidgetTypeId(WidgetTypeId widgetTypeId, boolean modify) throws ThingsboardException {
+        try {
+            validateId(widgetTypeId, "Incorrect widgetTypeId " + widgetTypeId);
+            WidgetType widgetType = widgetTypeService.findWidgetTypeById(widgetTypeId);
+            checkWidgetType(widgetType, modify);
+            return widgetType;
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    void checkWidgetType(WidgetType widgetType, boolean modify) throws ThingsboardException {
+        checkNotNull(widgetType);
+        if (widgetType.getTenantId() != null && !widgetType.getTenantId().getId().equals(ModelConstants.NULL_UUID)) {
+            checkTenantId(widgetType.getTenantId());
+        } else if (modify && getCurrentUser().getAuthority() != Authority.SYS_ADMIN) {
+            throw new ThingsboardException("You don't have permission to perform this operation!",
+                    ThingsboardErrorCode.PERMISSION_DENIED);
+        }
+    }
+
+    Dashboard checkDashboardId(DashboardId dashboardId) throws ThingsboardException {
+        try {
+            validateId(dashboardId, "Incorrect dashboardId " + dashboardId);
+            Dashboard dashboard = dashboardService.findDashboardById(dashboardId);
+            checkDashboard(dashboard);
+            return dashboard;
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    private void checkDashboard(Dashboard dashboard) throws ThingsboardException {
+        checkNotNull(dashboard);
+        checkTenantId(dashboard.getTenantId());
+        if (dashboard.getCustomerId() != null && !dashboard.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
+            checkCustomerId(dashboard.getCustomerId());
+        }
+    }
+
+    ComponentDescriptor checkComponentDescriptorByClazz(String clazz) throws ThingsboardException {
+        try {
+            log.debug("[{}] Lookup component descriptor", clazz);
+            ComponentDescriptor componentDescriptor = checkNotNull(componentDescriptorService.getComponent(clazz));
+            return componentDescriptor;
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    List<ComponentDescriptor> checkComponentDescriptorsByType(ComponentType type) throws ThingsboardException {
+        try {
+            log.debug("[{}] Lookup component descriptors", type);
+            return componentDescriptorService.getComponents(type);
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    List<ComponentDescriptor> checkPluginActionsByPluginClazz(String pluginClazz) throws ThingsboardException {
+        try {
+            checkComponentDescriptorByClazz(pluginClazz);
+            log.debug("[{}] Lookup plugin actions", pluginClazz);
+            return componentDescriptorService.getPluginActions(pluginClazz);
+        } catch (Exception e) {
+            throw handleException(e, false);
+        }
+    }
+
+    protected PluginMetaData checkPlugin(PluginMetaData plugin) throws ThingsboardException {
+        checkNotNull(plugin);
+        SecurityUser authUser = getCurrentUser();
+        TenantId tenantId = plugin.getTenantId();
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        if (authUser.getAuthority() != Authority.SYS_ADMIN) {
+            if (authUser.getTenantId() == null ||
+                    !tenantId.getId().equals(ModelConstants.NULL_UUID) && !authUser.getTenantId().equals(tenantId)) {
+                throw new ThingsboardException("You don't have permission to perform this operation!",
+                        ThingsboardErrorCode.PERMISSION_DENIED);
+
+            } else if (tenantId.getId().equals(ModelConstants.NULL_UUID)) {
+                plugin.setConfiguration(null);
+            }
+        }
+        return plugin;
+    }
+
+    protected RuleMetaData checkRule(RuleMetaData rule) throws ThingsboardException {
+        checkNotNull(rule);
+        checkTenantId(rule.getTenantId());
+        return rule;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
new file mode 100644
index 0000000..0744dd1
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/ComponentDescriptorController.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.exception.ThingsboardException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class ComponentDescriptorController extends BaseController {
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN')")
+    @RequestMapping(value = "/component/{componentDescriptorClazz:.+}", method = RequestMethod.GET)
+    @ResponseBody
+    public ComponentDescriptor getComponentDescriptorByClazz(@PathVariable("componentDescriptorClazz") String strComponentDescriptorClazz) throws ThingsboardException {
+        checkParameter("strComponentDescriptorClazz", strComponentDescriptorClazz);
+        try {
+            return checkComponentDescriptorByClazz(strComponentDescriptorClazz);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN')")
+    @RequestMapping(value = "/components/{componentType}", method = RequestMethod.GET)
+    @ResponseBody
+    public List<ComponentDescriptor> getComponentDescriptorsByType(@PathVariable("componentType") String strComponentType) throws ThingsboardException {
+        checkParameter("componentType", strComponentType);
+        try {
+            return checkComponentDescriptorsByType(ComponentType.valueOf(strComponentType));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN','TENANT_ADMIN')")
+    @RequestMapping(value = "/components/actions/{pluginClazz:.+}", method = RequestMethod.GET)
+    @ResponseBody
+    public List<ComponentDescriptor> getPluginActionsByPluginClazz(@PathVariable("pluginClazz") String pluginClazz) throws ThingsboardException {
+        checkParameter("pluginClazz", pluginClazz);
+        try {
+            return checkPluginActionsByPluginClazz(pluginClazz);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/CustomerController.java b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
new file mode 100644
index 0000000..93b4267
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/CustomerController.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.exception.ThingsboardException;
+
+@RestController
+@RequestMapping("/api")
+public class CustomerController extends BaseController {
+
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/customer/{customerId}", method = RequestMethod.GET)
+    @ResponseBody
+    public Customer getCustomerById(@PathVariable("customerId") String strCustomerId) throws ThingsboardException {
+        checkParameter("customerId", strCustomerId);
+        try {
+            CustomerId customerId = new CustomerId(toUUID(strCustomerId));
+            return checkCustomerId(customerId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/customer", method = RequestMethod.POST)
+    @ResponseBody 
+    public Customer saveCustomer(@RequestBody Customer customer) throws ThingsboardException {
+        try {
+            customer.setTenantId(getCurrentUser().getTenantId());
+            return checkNotNull(customerService.saveCustomer(customer));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/customer/{customerId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteCustomer(@PathVariable("customerId") String strCustomerId) throws ThingsboardException {
+        checkParameter("customerId", strCustomerId);
+        try {
+            CustomerId customerId = new CustomerId(toUUID(strCustomerId));
+            checkCustomerId(customerId);
+            customerService.deleteCustomer(customerId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/customers", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<Customer> getCustomers(@RequestParam int limit,
+                                               @RequestParam(required = false) String textSearch,
+                                               @RequestParam(required = false) String idOffset,
+                                               @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            TenantId tenantId = getCurrentUser().getTenantId();
+            return checkNotNull(customerService.findCustomersByTenantId(tenantId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/DashboardController.java b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
new file mode 100644
index 0000000..6ce92c9
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/DashboardController.java
@@ -0,0 +1,148 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.exception.ThingsboardException;
+
+@RestController
+@RequestMapping("/api")
+public class DashboardController extends BaseController {
+
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/dashboard/{dashboardId}", method = RequestMethod.GET)
+    @ResponseBody
+    public Dashboard getDashboardById(@PathVariable("dashboardId") String strDashboardId) throws ThingsboardException {
+        checkParameter("dashboardId", strDashboardId);
+        try {
+            DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
+            return checkDashboardId(dashboardId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/dashboard", method = RequestMethod.POST)
+    @ResponseBody 
+    public Dashboard saveDashboard(@RequestBody Dashboard dashboard) throws ThingsboardException {
+        try {
+            dashboard.setTenantId(getCurrentUser().getTenantId());
+            return checkNotNull(dashboardService.saveDashboard(dashboard));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/dashboard/{dashboardId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteDashboard(@PathVariable("dashboardId") String strDashboardId) throws ThingsboardException {
+        checkParameter("dashboardId", strDashboardId);
+        try {
+            DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
+            checkDashboardId(dashboardId);
+            dashboardService.deleteDashboard(dashboardId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/customer/{customerId}/dashboard/{dashboardId}", method = RequestMethod.POST)
+    @ResponseBody 
+    public Dashboard assignDashboardToCustomer(@PathVariable("customerId") String strCustomerId,
+                                         @PathVariable("dashboardId") String strDashboardId) throws ThingsboardException {
+        checkParameter("customerId", strCustomerId);
+        checkParameter("dashboardId", strDashboardId);
+        try {
+            CustomerId customerId = new CustomerId(toUUID(strCustomerId));
+            checkCustomerId(customerId);
+
+            DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
+            checkDashboardId(dashboardId);
+            
+            return checkNotNull(dashboardService.assignDashboardToCustomer(dashboardId, customerId));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/customer/dashboard/{dashboardId}", method = RequestMethod.DELETE)
+    @ResponseBody 
+    public Dashboard unassignDashboardFromCustomer(@PathVariable("dashboardId") String strDashboardId) throws ThingsboardException {
+        checkParameter("dashboardId", strDashboardId);
+        try {
+            DashboardId dashboardId = new DashboardId(toUUID(strDashboardId));
+            Dashboard dashboard = checkDashboardId(dashboardId);
+            if (dashboard.getCustomerId() == null || dashboard.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
+                throw new IncorrectParameterException("Dashboard isn't assigned to any customer!");
+            }
+            return checkNotNull(dashboardService.unassignDashboardFromCustomer(dashboardId));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/tenant/dashboards", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<Dashboard> getTenantDashboards(
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TenantId tenantId = getCurrentUser().getTenantId();
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(dashboardService.findDashboardsByTenantId(tenantId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/customer/{customerId}/dashboards", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<Dashboard> getCustomerDashboards(
+            @PathVariable("customerId") String strCustomerId,
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        checkParameter("customerId", strCustomerId);
+        try {
+            TenantId tenantId = getCurrentUser().getTenantId();
+            CustomerId customerId = new CustomerId(toUUID(strCustomerId));
+            checkCustomerId(customerId);
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(dashboardService.findDashboardsByTenantIdAndCustomerId(tenantId, customerId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/DeviceController.java b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
new file mode 100644
index 0000000..1c0a7be
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/DeviceController.java
@@ -0,0 +1,176 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.exception.ThingsboardException;
+
+@RestController
+@RequestMapping("/api")
+public class DeviceController extends BaseController {
+
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/device/{deviceId}", method = RequestMethod.GET)
+    @ResponseBody
+    public Device getDeviceById(@PathVariable("deviceId") String strDeviceId) throws ThingsboardException {
+        checkParameter("deviceId", strDeviceId);
+        try {
+            DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
+            return checkDeviceId(deviceId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/device", method = RequestMethod.POST)
+    @ResponseBody 
+    public Device saveDevice(@RequestBody Device device) throws ThingsboardException {
+        try {
+            device.setTenantId(getCurrentUser().getTenantId());
+            return checkNotNull(deviceService.saveDevice(device));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/device/{deviceId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteDevice(@PathVariable("deviceId") String strDeviceId) throws ThingsboardException {
+        checkParameter("deviceId", strDeviceId);
+        try {
+            DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
+            checkDeviceId(deviceId);
+            deviceService.deleteDevice(deviceId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/customer/{customerId}/device/{deviceId}", method = RequestMethod.POST)
+    @ResponseBody 
+    public Device assignDeviceToCustomer(@PathVariable("customerId") String strCustomerId,
+                                         @PathVariable("deviceId") String strDeviceId) throws ThingsboardException {
+        checkParameter("customerId", strCustomerId);
+        checkParameter("deviceId", strDeviceId);
+        try {
+            CustomerId customerId = new CustomerId(toUUID(strCustomerId));
+            checkCustomerId(customerId);
+
+            DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
+            checkDeviceId(deviceId);
+            
+            return checkNotNull(deviceService.assignDeviceToCustomer(deviceId, customerId));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/customer/device/{deviceId}", method = RequestMethod.DELETE)
+    @ResponseBody 
+    public Device unassignDeviceFromCustomer(@PathVariable("deviceId") String strDeviceId) throws ThingsboardException {
+        checkParameter("deviceId", strDeviceId);
+        try {
+            DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
+            Device device = checkDeviceId(deviceId);
+            if (device.getCustomerId() == null || device.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
+                throw new IncorrectParameterException("Device isn't assigned to any customer!");
+            }
+            return checkNotNull(deviceService.unassignDeviceFromCustomer(deviceId));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/device/{deviceId}/credentials", method = RequestMethod.GET)
+    @ResponseBody
+    public DeviceCredentials getDeviceCredentialsByDeviceId(@PathVariable("deviceId") String strDeviceId) throws ThingsboardException {
+        checkParameter("deviceId", strDeviceId);
+        try {
+            DeviceId deviceId = new DeviceId(toUUID(strDeviceId));
+            checkDeviceId(deviceId);
+            return checkNotNull(deviceCredentialsService.findDeviceCredentialsByDeviceId(deviceId));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/device/credentials", method = RequestMethod.POST)
+    @ResponseBody 
+    public DeviceCredentials saveDeviceCredentials(@RequestBody DeviceCredentials deviceCredentials) throws ThingsboardException {
+        checkNotNull(deviceCredentials);
+        try {
+            checkDeviceId(deviceCredentials.getDeviceId());
+            return checkNotNull(deviceCredentialsService.updateDeviceCredentials(deviceCredentials));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/tenant/devices", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<Device> getTenantDevices(
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TenantId tenantId = getCurrentUser().getTenantId();
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(deviceService.findDevicesByTenantId(tenantId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/customer/{customerId}/devices", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<Device> getCustomerDevices(
+            @PathVariable("customerId") String strCustomerId,
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        checkParameter("customerId", strCustomerId);
+        try {
+            TenantId tenantId = getCurrentUser().getTenantId();
+            CustomerId customerId = new CustomerId(toUUID(strCustomerId));
+            checkCustomerId(customerId);
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/EventController.java b/application/src/main/java/org/thingsboard/server/controller/EventController.java
new file mode 100644
index 0000000..2ff1a73
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/EventController.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.data.id.*;
+import org.thingsboard.server.common.data.page.TimePageData;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.dao.event.EventService;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.exception.ThingsboardErrorCode;
+import org.thingsboard.server.exception.ThingsboardException;
+
+@RestController
+@RequestMapping("/api")
+public class EventController extends BaseController {
+
+    @Autowired
+    private EventService eventService;
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/events/{entityType}/{entityId}/{eventType}", method = RequestMethod.GET)
+    @ResponseBody
+    public TimePageData<Event> getEvents(
+            @PathVariable("entityType") String strEntityType,
+            @PathVariable("entityId") String strEntityId,
+            @PathVariable("eventType") String eventType,
+            @RequestParam("tenantId") String strTenantId,
+            @RequestParam int limit,
+            @RequestParam(required = false) Long startTime,
+            @RequestParam(required = false) Long endTime,
+            @RequestParam(required = false, defaultValue = "false") boolean ascOrder,
+            @RequestParam(required = false) String offset
+    ) throws ThingsboardException {
+        checkParameter("EntityId", strEntityId);
+        checkParameter("EntityType", strEntityType);
+        try {
+            TenantId tenantId = new TenantId(toUUID(strTenantId));
+            if (!tenantId.getId().equals(ModelConstants.NULL_UUID) &&
+                    !tenantId.equals(getCurrentUser().getTenantId())) {
+                throw new ThingsboardException("You don't have permission to perform this operation!",
+                        ThingsboardErrorCode.PERMISSION_DENIED);
+            }
+            TimePageLink pageLink = createPageLink(limit, startTime, endTime, ascOrder, offset);
+            return checkNotNull(eventService.findEvents(tenantId, getEntityId(strEntityType, strEntityId), eventType, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/events/{entityType}/{entityId}", method = RequestMethod.GET)
+    @ResponseBody
+    public TimePageData<Event> getEvents(
+            @PathVariable("entityType") String strEntityType,
+            @PathVariable("entityId") String strEntityId,
+            @RequestParam("tenantId") String strTenantId,
+            @RequestParam int limit,
+            @RequestParam(required = false) Long startTime,
+            @RequestParam(required = false) Long endTime,
+            @RequestParam(required = false, defaultValue = "false") boolean ascOrder,
+            @RequestParam(required = false) String offset
+    ) throws ThingsboardException {
+        checkParameter("EntityId", strEntityId);
+        checkParameter("EntityType", strEntityType);
+        try {
+            TenantId tenantId = new TenantId(toUUID(strTenantId));
+            if (!tenantId.getId().equals(ModelConstants.NULL_UUID) &&
+                    !tenantId.equals(getCurrentUser().getTenantId())) {
+                throw new ThingsboardException("You don't have permission to perform this operation!",
+                        ThingsboardErrorCode.PERMISSION_DENIED);
+            }
+            TimePageLink pageLink = createPageLink(limit, startTime, endTime, ascOrder, offset);
+            return checkNotNull(eventService.findEvents(tenantId, getEntityId(strEntityType, strEntityId), pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+
+    private EntityId getEntityId(String strEntityType, String strEntityId) throws ThingsboardException {
+        EntityId entityId;
+        EntityType entityType = EntityType.valueOf(strEntityType);
+        switch (entityType) {
+            case RULE:
+                entityId = new RuleId(toUUID(strEntityId));
+                break;
+            case PLUGIN:
+                entityId = new PluginId(toUUID(strEntityId));
+                break;
+            case DEVICE:
+                entityId = new DeviceId(toUUID(strEntityId));
+                break;
+            default:
+                throw new ThingsboardException("EntityType ['" + entityType + "'] is incorrect!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        }
+        return entityId;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java
new file mode 100644
index 0000000..d9b0ab4
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginApiController.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller.plugin;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.RequestEntity;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.context.request.async.DeferredResult;
+import org.thingsboard.server.actors.service.ActorService;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.controller.BaseController;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.plugin.PluginService;
+import org.thingsboard.server.exception.ThingsboardException;
+import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext;
+import org.thingsboard.server.extensions.api.plugins.PluginConstants;
+import org.thingsboard.server.extensions.api.plugins.rest.BasicPluginRestMsg;
+import org.thingsboard.server.extensions.api.plugins.rest.RestRequest;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping(PluginConstants.PLUGIN_URL_PREFIX)
+@Slf4j
+public class PluginApiController extends BaseController {
+
+    @Autowired
+    private ActorService actorService;
+
+    @Autowired
+    private PluginService pluginService;
+
+    @SuppressWarnings("rawtypes")
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/{pluginToken}/**")
+    @ResponseStatus(value = HttpStatus.OK)
+    public DeferredResult<ResponseEntity> processRequest(
+            @PathVariable("pluginToken") String pluginToken,
+            RequestEntity<byte[]> requestEntity,
+            HttpServletRequest request)
+            throws ThingsboardException {
+        log.debug("[{}] Going to process requst uri: {}", pluginToken, requestEntity.getUrl());
+        DeferredResult<ResponseEntity> result = new DeferredResult<ResponseEntity>();
+        PluginMetaData pluginMd = pluginService.findPluginByApiToken(pluginToken);
+        if (pluginMd == null) {
+            result.setErrorResult(new PluginNotFoundException("Plugin with token: " + pluginToken + " not found!"));
+        } else {
+            TenantId tenantId = getCurrentUser().getTenantId();
+            CustomerId customerId = getCurrentUser().getCustomerId();
+            if (validatePluginAccess(pluginMd, tenantId, customerId)) {
+                if(ModelConstants.NULL_UUID.equals(tenantId.getId())){
+                    tenantId = null;
+                }
+                PluginApiCallSecurityContext securityCtx = new PluginApiCallSecurityContext(pluginMd.getTenantId(), pluginMd.getId(), tenantId, customerId);
+                actorService.process(new BasicPluginRestMsg(securityCtx, new RestRequest(requestEntity, request), result));
+            } else {
+                result.setResult(new ResponseEntity<>(HttpStatus.FORBIDDEN));
+            }
+
+        }
+        return result;
+    }
+
+    public static boolean validatePluginAccess(PluginMetaData pluginMd, TenantId tenantId, CustomerId customerId) {
+        boolean systemAdministrator = tenantId == null || ModelConstants.NULL_UUID.equals(tenantId.getId());
+        boolean tenantAdministrator = !systemAdministrator && (customerId == null || ModelConstants.NULL_UUID.equals(customerId.getId()));
+        boolean systemPlugin = ModelConstants.NULL_UUID.equals(pluginMd.getTenantId().getId());
+
+        boolean validUser = false;
+        if (systemPlugin) {
+            if (pluginMd.isPublicAccess() || systemAdministrator) {
+                // All users can access public system plugins. Only system
+                // users can access private system plugins
+                validUser = true;
+            }
+        } else {
+            if ((pluginMd.isPublicAccess() || tenantAdministrator) && tenantId.equals(pluginMd.getTenantId())) {
+                // All tenant users can access public tenant plugins. Only tenant
+                // administrator can access private tenant plugins
+                validUser = true;
+            }
+        }
+        return validUser;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginNotFoundException.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginNotFoundException.java
new file mode 100644
index 0000000..b105bb8
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginNotFoundException.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller.plugin;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(HttpStatus.NOT_FOUND)
+public class PluginNotFoundException extends RuntimeException {
+
+    private static final long serialVersionUID = 1L;
+    
+    public PluginNotFoundException(String message){
+        super(message);
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java
new file mode 100644
index 0000000..dbc1c81
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java
@@ -0,0 +1,203 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller.plugin;
+
+import java.io.IOException;
+import java.net.URI;
+import java.security.InvalidParameterException;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import org.thingsboard.server.actors.service.ActorService;
+import org.thingsboard.server.config.WebSocketConfiguration;
+import org.thingsboard.server.extensions.api.plugins.PluginConstants;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.dao.plugin.PluginService;
+import org.thingsboard.server.extensions.api.plugins.PluginApiCallSecurityContext;
+import org.thingsboard.server.extensions.api.plugins.ws.BasicPluginWebsocketSessionRef;
+import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef;
+import org.thingsboard.server.extensions.api.plugins.ws.SessionEvent;
+import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg;
+import org.thingsboard.server.extensions.api.plugins.ws.msg.SessionEventPluginWebSocketMsg;
+import org.thingsboard.server.extensions.api.plugins.ws.msg.TextPluginWebSocketMsg;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+@Service
+@Slf4j
+public class PluginWebSocketHandler extends TextWebSocketHandler implements PluginWebSocketMsgEndpoint {
+
+    private static final ConcurrentMap<String, SessionMetaData> internalSessionMap = new ConcurrentHashMap<>();
+    private static final ConcurrentMap<String, String> externalSessionMap = new ConcurrentHashMap<>();
+
+    @Autowired @Lazy
+    private ActorService actorService;
+
+    @Autowired @Lazy
+    private PluginService pluginService;
+
+    @Override
+    public void handleTextMessage(WebSocketSession session, TextMessage message) {
+        try {
+            log.info("[{}] Processing {}", session.getId(), message);
+            SessionMetaData sessionMd = internalSessionMap.get(session.getId());
+            if (sessionMd != null) {
+                actorService.process(new TextPluginWebSocketMsg(sessionMd.sessionRef, message.getPayload()));
+            } else {
+                log.warn("[{}] Failed to find session", session.getId());
+                session.close(CloseStatus.SERVER_ERROR.withReason("Session not found!"));
+            }
+            session.sendMessage(message);
+        } catch (IOException e) {
+            log.warn("IO error", e);
+        }
+    }
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        super.afterConnectionEstablished(session);
+        try {
+            String internalSessionId = session.getId();
+            PluginWebsocketSessionRef sessionRef = toRef(session);
+            String externalSessionId = sessionRef.getSessionId();
+            internalSessionMap.put(internalSessionId, new SessionMetaData(session, sessionRef));
+            externalSessionMap.put(externalSessionId, internalSessionId);
+            actorService.process(new SessionEventPluginWebSocketMsg(sessionRef, SessionEvent.onEstablished()));
+            log.info("[{}][{}] Session is started", externalSessionId, session.getId());
+        } catch (InvalidParameterException e) {
+            log.warn("[[{}] Failed to start session", session.getId(), e);
+            session.close(CloseStatus.BAD_DATA.withReason(e.getMessage()));
+        } catch (Exception e) {
+            log.warn("[{}] Failed to start session", session.getId(), e);
+            session.close(CloseStatus.SERVER_ERROR.withReason(e.getMessage()));
+        }
+    }
+
+    @Override
+    public void handleTransportError(WebSocketSession session, Throwable tError) throws Exception {
+        super.handleTransportError(session, tError);
+        SessionMetaData sessionMd = internalSessionMap.get(session.getId());
+        if (sessionMd != null) {
+            actorService.process(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onError(tError)));
+        } else {
+            log.warn("[{}] Failed to find session", session.getId());
+        }
+        log.trace("[{}] Session transport error", session.getId(), tError);
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus closeStatus) throws Exception {
+        super.afterConnectionClosed(session, closeStatus);
+        SessionMetaData sessionMd = internalSessionMap.remove(session.getId());
+        if (sessionMd != null) {
+            externalSessionMap.remove(sessionMd.sessionRef.getSessionId());
+            actorService.process(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onClosed()));
+        }
+        log.info("[{}] Session is closed", session.getId());
+    }
+
+    private PluginWebsocketSessionRef toRef(WebSocketSession session) throws IOException {
+        URI sessionUri = session.getUri();
+        String path = sessionUri.getPath();
+        path = path.substring(WebSocketConfiguration.WS_PLUGIN_PREFIX.length());
+        if (path.length() == 0) {
+            throw new IllegalArgumentException("URL should contain plugin token!");
+        }
+        String[] pathElements = path.split("/");
+        String pluginToken = pathElements[0];
+        // TODO: cache
+        PluginMetaData pluginMd = pluginService.findPluginByApiToken(pluginToken);
+        if (pluginMd == null) {
+            throw new InvalidParameterException("Can't find plugin with specified token!");
+        } else {
+            SecurityUser currentUser = (SecurityUser) session.getAttributes().get(WebSocketConfiguration.WS_SECURITY_USER_ATTRIBUTE);
+            TenantId tenantId = currentUser.getTenantId();
+            CustomerId customerId = currentUser.getCustomerId();
+            if (PluginApiController.validatePluginAccess(pluginMd, tenantId, customerId)) {
+                PluginApiCallSecurityContext securityCtx = new PluginApiCallSecurityContext(pluginMd.getTenantId(), pluginMd.getId(), tenantId,
+                        currentUser.getCustomerId());
+                return new BasicPluginWebsocketSessionRef(UUID.randomUUID().toString(), securityCtx, session.getUri(), session.getAttributes(),
+                        session.getLocalAddress(), session.getRemoteAddress());
+            } else {
+                throw new SecurityException("Current user is not allowed to use this plugin!");
+            }
+        }
+    }
+
+    private static class SessionMetaData {
+        private final WebSocketSession session;
+        private final PluginWebsocketSessionRef sessionRef;
+
+        public SessionMetaData(WebSocketSession session, PluginWebsocketSessionRef sessionRef) {
+            super();
+            this.session = session;
+            this.sessionRef = sessionRef;
+        }
+    }
+
+    @Override
+    public void send(PluginWebsocketMsg<?> wsMsg) throws IOException {
+        PluginWebsocketSessionRef sessionRef = wsMsg.getSessionRef();
+        String externalId = sessionRef.getSessionId();
+        log.debug("[{}] Processing {}", externalId, wsMsg);
+        String internalId = externalSessionMap.get(externalId);
+        if (internalId != null) {
+            SessionMetaData sessionMd = internalSessionMap.get(internalId);
+            if (sessionMd != null) {
+                if (wsMsg instanceof TextPluginWebSocketMsg) {
+                    String payload = ((TextPluginWebSocketMsg) wsMsg).getPayload();
+                    sessionMd.session.sendMessage(new TextMessage(payload));
+                }
+            } else {
+                log.warn("[{}][{}] Failed to find session by internal id", externalId, internalId);
+            }
+        } else {
+            log.warn("[{}] Failed to find session by external id", externalId);
+        }
+    }
+
+    @Override
+    public void close(PluginWebsocketSessionRef sessionRef) throws IOException {
+        String externalId = sessionRef.getSessionId();
+        log.debug("[{}] Processing close request", externalId);
+        String internalId = externalSessionMap.get(externalId);
+        if (internalId != null) {
+            SessionMetaData sessionMd = internalSessionMap.get(internalId);
+            if (sessionMd != null) {
+                sessionMd.session.close(CloseStatus.NORMAL);
+            } else {
+                log.warn("[{}][{}] Failed to find session by internal id", externalId, internalId);
+            }
+        } else {
+            log.warn("[{}] Failed to find session by external id", externalId);
+        }
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketMsgEndpoint.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketMsgEndpoint.java
new file mode 100644
index 0000000..75b6012
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketMsgEndpoint.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller.plugin;
+
+import java.io.IOException;
+
+import org.thingsboard.server.extensions.api.plugins.ws.PluginWebsocketSessionRef;
+import org.thingsboard.server.extensions.api.plugins.ws.msg.PluginWebsocketMsg;
+
+public interface PluginWebSocketMsgEndpoint {
+
+    void send(PluginWebsocketMsg<?> wsMsg) throws IOException;
+
+    void close(PluginWebsocketSessionRef sessionRef) throws IOException;
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/PluginController.java b/application/src/main/java/org/thingsboard/server/controller/PluginController.java
new file mode 100644
index 0000000..6f06eb3
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/PluginController.java
@@ -0,0 +1,197 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.id.PluginId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.exception.ThingsboardException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class PluginController extends BaseController {
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/plugin/{pluginId}", method = RequestMethod.GET)
+    @ResponseBody
+    public PluginMetaData getPluginById(@PathVariable("pluginId") String strPluginId) throws ThingsboardException {
+        checkParameter("pluginId", strPluginId);
+        try {
+            PluginId pluginId = new PluginId(toUUID(strPluginId));
+            return checkPlugin(pluginService.findPluginById(pluginId));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/plugin/token/{pluginToken}", method = RequestMethod.GET)
+    @ResponseBody
+    public PluginMetaData getPluginByToken(@PathVariable("pluginToken") String pluginToken) throws ThingsboardException {
+        checkParameter("pluginToken", pluginToken);
+        try {
+            return checkPlugin(pluginService.findPluginByApiToken(pluginToken));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/plugin", method = RequestMethod.POST)
+    @ResponseBody
+    public PluginMetaData savePlugin(@RequestBody PluginMetaData source) throws ThingsboardException {
+        try {
+            boolean created = source.getId() == null;
+            source.setTenantId(getCurrentUser().getTenantId());
+            PluginMetaData plugin = checkNotNull(pluginService.savePlugin(source));
+            actorService.onPluginStateChange(plugin.getTenantId(), plugin.getId(),
+                    created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
+            return plugin;
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/plugin/{pluginId}/activate", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void activatePluginById(@PathVariable("pluginId") String strPluginId) throws ThingsboardException {
+        checkParameter("pluginId", strPluginId);
+        try {
+            PluginId pluginId = new PluginId(toUUID(strPluginId));
+            PluginMetaData plugin = checkPlugin(pluginService.findPluginById(pluginId));
+            pluginService.activatePluginById(pluginId);
+            actorService.onPluginStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.ACTIVATED);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/plugin/{pluginId}/suspend", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void suspendPluginById(@PathVariable("pluginId") String strPluginId) throws ThingsboardException {
+        checkParameter("pluginId", strPluginId);
+        try {
+            PluginId pluginId = new PluginId(toUUID(strPluginId));
+            PluginMetaData plugin = checkPlugin(pluginService.findPluginById(pluginId));
+            pluginService.suspendPluginById(pluginId);
+            actorService.onPluginStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.SUSPENDED);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/plugin/system", params = {"limit"}, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<PluginMetaData> getSystemPlugins(
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(pluginService.findSystemPlugins(pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/plugin/tenant/{tenantId}", params = {"limit"}, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<PluginMetaData> getTenantPlugins(
+            @PathVariable("tenantId") String strTenantId,
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        checkParameter("tenantId", strTenantId);
+        try {
+            TenantId tenantId = new TenantId(toUUID(strTenantId));
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(pluginService.findTenantPlugins(tenantId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/plugins", method = RequestMethod.GET)
+    @ResponseBody
+    public List<PluginMetaData> getPlugins() throws ThingsboardException {
+        try {
+            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+                return checkNotNull(pluginService.findSystemPlugins());
+            } else {
+                TenantId tenantId = getCurrentUser().getTenantId();
+                List<PluginMetaData> plugins = checkNotNull(pluginService.findAllTenantPluginsByTenantId(tenantId));
+                plugins.stream()
+                        .filter(plugin -> plugin.getTenantId().getId().equals(ModelConstants.NULL_UUID))
+                        .forEach(plugin -> plugin.setConfiguration(null));
+                return plugins;
+            }
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/plugin", params = {"limit"}, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<PluginMetaData> getTenantPlugins(
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TenantId tenantId = getCurrentUser().getTenantId();
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(pluginService.findTenantPlugins(tenantId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/plugin/{pluginId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deletePlugin(@PathVariable("pluginId") String strPluginId) throws ThingsboardException {
+        checkParameter("pluginId", strPluginId);
+        try {
+            PluginId pluginId = new PluginId(toUUID(strPluginId));
+            PluginMetaData plugin = checkPlugin(pluginService.findPluginById(pluginId));
+            pluginService.deletePluginById(pluginId);
+            actorService.onPluginStateChange(plugin.getTenantId(), plugin.getId(), ComponentLifecycleEvent.DELETED);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/RuleController.java b/application/src/main/java/org/thingsboard/server/controller/RuleController.java
new file mode 100644
index 0000000..3c04619
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/RuleController.java
@@ -0,0 +1,193 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.id.RuleId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.exception.ThingsboardException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class RuleController extends BaseController {
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/rule/{ruleId}", method = RequestMethod.GET)
+    @ResponseBody
+    public RuleMetaData getRuleById(@PathVariable("ruleId") String strRuleId) throws ThingsboardException {
+        checkParameter("ruleId", strRuleId);
+        try {
+            RuleId ruleId = new RuleId(toUUID(strRuleId));
+            return checkRule(ruleService.findRuleById(ruleId));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/rule/token/{pluginToken}", method = RequestMethod.GET)
+    @ResponseBody
+    public List<RuleMetaData> getRulesByPluginToken(@PathVariable("pluginToken") String pluginToken) throws ThingsboardException {
+        checkParameter("pluginToken", pluginToken);
+        try {
+            PluginMetaData plugin = checkPlugin(pluginService.findPluginByApiToken(pluginToken));
+            return ruleService.findPluginRules(plugin.getApiToken());
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/rule", method = RequestMethod.POST)
+    @ResponseBody
+    public RuleMetaData saveRule(@RequestBody RuleMetaData source) throws ThingsboardException {
+        try {
+            boolean created = source.getId() == null;
+            source.setTenantId(getCurrentUser().getTenantId());
+            RuleMetaData rule = checkNotNull(ruleService.saveRule(source));
+            actorService.onRuleStateChange(rule.getTenantId(), rule.getId(),
+                    created ? ComponentLifecycleEvent.CREATED : ComponentLifecycleEvent.UPDATED);
+            return rule;
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/rule/{ruleId}/activate", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void activateRuleById(@PathVariable("ruleId") String strRuleId) throws ThingsboardException {
+        checkParameter("ruleId", strRuleId);
+        try {
+            RuleId ruleId = new RuleId(toUUID(strRuleId));
+            RuleMetaData rule = checkRule(ruleService.findRuleById(ruleId));
+            ruleService.activateRuleById(ruleId);
+            actorService.onRuleStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.ACTIVATED);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/rule/{ruleId}/suspend", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void suspendRuleById(@PathVariable("ruleId") String strRuleId) throws ThingsboardException {
+        checkParameter("ruleId", strRuleId);
+        try {
+            RuleId ruleId = new RuleId(toUUID(strRuleId));
+            RuleMetaData rule = checkRule(ruleService.findRuleById(ruleId));
+            ruleService.suspendRuleById(ruleId);
+            actorService.onRuleStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.SUSPENDED);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/rule/system", params = {"limit"}, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<RuleMetaData> getSystemRules(
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(ruleService.findSystemRules(pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/rule/tenant/{tenantId}", params = {"limit"}, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<RuleMetaData> getTenantRules(
+            @PathVariable("tenantId") String strTenantId,
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        checkParameter("tenantId", strTenantId);
+        try {
+            TenantId tenantId = new TenantId(toUUID(strTenantId));
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(ruleService.findTenantRules(tenantId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/rules", method = RequestMethod.GET)
+    @ResponseBody
+    public List<RuleMetaData> getRules() throws ThingsboardException {
+        try {
+            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+                return checkNotNull(ruleService.findSystemRules());
+            } else {
+                TenantId tenantId = getCurrentUser().getTenantId();
+                return checkNotNull(ruleService.findAllTenantRulesByTenantId(tenantId));
+            }
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/rule", params = {"limit"}, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<RuleMetaData> getTenantRules(
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TenantId tenantId = getCurrentUser().getTenantId();
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(ruleService.findTenantRules(tenantId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/rule/{ruleId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteRule(@PathVariable("ruleId") String strRuleId) throws ThingsboardException {
+        checkParameter("ruleId", strRuleId);
+        try {
+            RuleId ruleId = new RuleId(toUUID(strRuleId));
+            RuleMetaData rule = checkRule(ruleService.findRuleById(ruleId));
+            ruleService.deleteRuleById(ruleId);
+            actorService.onRuleStateChange(rule.getTenantId(), rule.getId(), ComponentLifecycleEvent.DELETED);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/TenantController.java b/application/src/main/java/org/thingsboard/server/controller/TenantController.java
new file mode 100644
index 0000000..6dd38a3
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/TenantController.java
@@ -0,0 +1,89 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.tenant.TenantService;
+import org.thingsboard.server.exception.ThingsboardException;
+
+@RestController
+@RequestMapping("/api")
+public class TenantController extends BaseController {
+    
+    @Autowired
+    private TenantService tenantService;
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/tenant/{tenantId}", method = RequestMethod.GET)
+    @ResponseBody
+    public Tenant getTenantById(@PathVariable("tenantId") String strTenantId) throws ThingsboardException {
+        checkParameter("tenantId", strTenantId);
+        try {
+            TenantId tenantId = new TenantId(toUUID(strTenantId));
+            checkTenantId(tenantId);
+            return checkNotNull(tenantService.findTenantById(tenantId));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/tenant", method = RequestMethod.POST)
+    @ResponseBody 
+    public Tenant saveTenant(@RequestBody Tenant tenant) throws ThingsboardException {
+        try {
+            return checkNotNull(tenantService.saveTenant(tenant));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/tenant/{tenantId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteTenant(@PathVariable("tenantId") String strTenantId) throws ThingsboardException {
+        checkParameter("tenantId", strTenantId);
+        try {
+            TenantId tenantId = new TenantId(toUUID(strTenantId));
+            tenantService.deleteTenant(tenantId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/tenants", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<Tenant> getTenants(@RequestParam int limit,
+                                           @RequestParam(required = false) String textSearch,
+                                           @RequestParam(required = false) String idOffset,
+                                           @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(tenantService.findTenants(pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+    
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/UserController.java b/application/src/main/java/org/thingsboard/server/controller/UserController.java
new file mode 100644
index 0000000..2c436f0
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/UserController.java
@@ -0,0 +1,179 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.exception.ThingsboardErrorCode;
+import org.thingsboard.server.exception.ThingsboardException;
+import org.thingsboard.server.service.mail.MailService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+import javax.servlet.http.HttpServletRequest;
+
+@RestController
+@RequestMapping("/api")
+public class UserController extends BaseController {
+
+    @Autowired
+    private MailService mailService;
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/user/{userId}", method = RequestMethod.GET)
+    @ResponseBody
+    public User getUserById(@PathVariable("userId") String strUserId) throws ThingsboardException {
+        checkParameter("userId", strUserId);
+        try {
+            UserId userId = new UserId(toUUID(strUserId));
+            SecurityUser authUser = getCurrentUser();
+            if (authUser.getAuthority() == Authority.CUSTOMER_USER && !authUser.getId().equals(userId)) {
+                throw new ThingsboardException("You don't have permission to perform this operation!",
+                        ThingsboardErrorCode.PERMISSION_DENIED);
+            }
+            return checkUserId(userId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/user", method = RequestMethod.POST)
+    @ResponseBody 
+    public User saveUser(@RequestBody User user,
+            HttpServletRequest request) throws ThingsboardException {
+        try {
+            SecurityUser authUser = getCurrentUser();
+            if (authUser.getAuthority() == Authority.CUSTOMER_USER && !authUser.getId().equals(user.getId())) {
+                throw new ThingsboardException("You don't have permission to perform this operation!",
+                        ThingsboardErrorCode.PERMISSION_DENIED);
+            }
+            boolean sendEmail = user.getId() == null;
+            if (getCurrentUser().getAuthority() == Authority.TENANT_ADMIN) {
+                user.setTenantId(getCurrentUser().getTenantId());
+            }
+            User savedUser = checkNotNull(userService.saveUser(user));
+            if (sendEmail) {
+                UserCredentials userCredentials = userService.findUserCredentialsByUserId(savedUser.getId());
+                String baseUrl = String.format("%s://%s:%d",
+                        request.getScheme(),  
+                        request.getServerName(), 
+                        request.getServerPort());             
+                String activateUrl = String.format("%s/api/noauth/activate?activateToken=%s", baseUrl,
+                        userCredentials.getActivateToken());
+                String email = savedUser.getEmail();
+                try {
+                    mailService.sendActivationEmail(activateUrl, email);
+                } catch (ThingsboardException e) {
+                    userService.deleteUser(savedUser.getId());
+                    throw e;
+                }
+            }
+            return savedUser;
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/user/sendActivationMail", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void sendActivationEmail(
+            @RequestParam(value = "email") String email,
+            HttpServletRequest request) throws ThingsboardException {
+        try {
+            User user = checkNotNull(userService.findUserByEmail(email));
+            UserCredentials userCredentials = userService.findUserCredentialsByUserId(user.getId());
+            if (!userCredentials.isEnabled()) {
+                String baseUrl = String.format("%s://%s:%d",
+                        request.getScheme(),  
+                        request.getServerName(), 
+                        request.getServerPort());             
+                String activateUrl = String.format("%s/api/noauth/activate?activateToken=%s", baseUrl,
+                        userCredentials.getActivateToken());
+                mailService.sendActivationEmail(activateUrl, email);
+            } else {
+                throw new ThingsboardException("User is already active!", ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+            }
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/user/{userId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteUser(@PathVariable("userId") String strUserId) throws ThingsboardException {
+        checkParameter("userId", strUserId);
+        try {
+            UserId userId = new UserId(toUUID(strUserId));
+            checkUserId(userId);
+            userService.deleteUser(userId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('SYS_ADMIN')")
+    @RequestMapping(value = "/tenant/{tenantId}/users", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<User> getTenantAdmins(
+            @PathVariable("tenantId") String strTenantId,
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        checkParameter("tenantId", strTenantId);
+        try {
+            TenantId tenantId = new TenantId(toUUID(strTenantId));
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            return checkNotNull(userService.findTenantAdmins(tenantId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAuthority('TENANT_ADMIN')")
+    @RequestMapping(value = "/customer/{customerId}/users", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<User> getCustomerUsers(
+            @PathVariable("customerId") String strCustomerId,
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        checkParameter("customerId", strCustomerId);
+        try {
+            CustomerId customerId = new CustomerId(toUUID(strCustomerId));
+            checkCustomerId(customerId);
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            TenantId tenantId = getCurrentUser().getTenantId();
+            return checkNotNull(userService.findCustomerUsers(tenantId, customerId, pageLink));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+    
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
new file mode 100644
index 0000000..e06962b
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetsBundleController.java
@@ -0,0 +1,116 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.WidgetsBundleId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.exception.ThingsboardException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class WidgetsBundleController extends BaseController {
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetsBundle/{widgetsBundleId}", method = RequestMethod.GET)
+    @ResponseBody
+    public WidgetsBundle getWidgetsBundleById(@PathVariable("widgetsBundleId") String strWidgetsBundleId) throws ThingsboardException {
+        checkParameter("widgetsBundleId", strWidgetsBundleId);
+        try {
+            WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
+            return checkWidgetsBundleId(widgetsBundleId, false);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetsBundle", method = RequestMethod.POST)
+    @ResponseBody
+    public WidgetsBundle saveWidgetsBundle(@RequestBody WidgetsBundle widgetsBundle) throws ThingsboardException {
+        try {
+            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+                widgetsBundle.setTenantId(new TenantId(ModelConstants.NULL_UUID));
+            } else {
+                widgetsBundle.setTenantId(getCurrentUser().getTenantId());
+            }
+            return checkNotNull(widgetsBundleService.saveWidgetsBundle(widgetsBundle));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetsBundle/{widgetsBundleId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteWidgetsBundle(@PathVariable("widgetsBundleId") String strWidgetsBundleId) throws ThingsboardException {
+        checkParameter("widgetsBundleId", strWidgetsBundleId);
+        try {
+            WidgetsBundleId widgetsBundleId = new WidgetsBundleId(toUUID(strWidgetsBundleId));
+            checkWidgetsBundleId(widgetsBundleId, true);
+            widgetsBundleService.deleteWidgetsBundle(widgetsBundleId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetsBundles", params = { "limit" }, method = RequestMethod.GET)
+    @ResponseBody
+    public TextPageData<WidgetsBundle> getWidgetsBundles(
+            @RequestParam int limit,
+            @RequestParam(required = false) String textSearch,
+            @RequestParam(required = false) String idOffset,
+            @RequestParam(required = false) String textOffset) throws ThingsboardException {
+        try {
+            TextPageLink pageLink = createPageLink(limit, textSearch, idOffset, textOffset);
+            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+                return checkNotNull(widgetsBundleService.findSystemWidgetsBundlesByPageLink(pageLink));
+            } else {
+                TenantId tenantId = getCurrentUser().getTenantId();
+                return checkNotNull(widgetsBundleService.findAllTenantWidgetsBundlesByTenantIdAndPageLink(tenantId, pageLink));
+            }
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetsBundles", method = RequestMethod.GET)
+    @ResponseBody
+    public List<WidgetsBundle> getWidgetsBundles() throws ThingsboardException {
+        try {
+            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+                return checkNotNull(widgetsBundleService.findSystemWidgetsBundles());
+            } else {
+                TenantId tenantId = getCurrentUser().getTenantId();
+                return checkNotNull(widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(tenantId));
+            }
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
new file mode 100644
index 0000000..c3ded12
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/controller/WidgetTypeController.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.WidgetTypeId;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.exception.ThingsboardException;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class WidgetTypeController extends BaseController {
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetType/{widgetTypeId}", method = RequestMethod.GET)
+    @ResponseBody
+    public WidgetType getWidgetTypeById(@PathVariable("widgetTypeId") String strWidgetTypeId) throws ThingsboardException {
+        checkParameter("widgetTypeId", strWidgetTypeId);
+        try {
+            WidgetTypeId widgetTypeId = new WidgetTypeId(toUUID(strWidgetTypeId));
+            return checkWidgetTypeId(widgetTypeId, false);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetType", method = RequestMethod.POST)
+    @ResponseBody
+    public WidgetType saveWidgetType(@RequestBody WidgetType widgetType) throws ThingsboardException {
+        try {
+            if (getCurrentUser().getAuthority() == Authority.SYS_ADMIN) {
+                widgetType.setTenantId(new TenantId(ModelConstants.NULL_UUID));
+            } else {
+                widgetType.setTenantId(getCurrentUser().getTenantId());
+            }
+            return checkNotNull(widgetTypeService.saveWidgetType(widgetType));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetType/{widgetTypeId}", method = RequestMethod.DELETE)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void deleteWidgetType(@PathVariable("widgetTypeId") String strWidgetTypeId) throws ThingsboardException {
+        checkParameter("widgetTypeId", strWidgetTypeId);
+        try {
+            WidgetTypeId widgetTypeId = new WidgetTypeId(toUUID(strWidgetTypeId));
+            checkWidgetTypeId(widgetTypeId, true);
+            widgetTypeService.deleteWidgetType(widgetTypeId);
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN')")
+    @RequestMapping(value = "/widgetTypes", params = { "isSystem", "bundleAlias"}, method = RequestMethod.GET)
+    @ResponseBody
+    public List<WidgetType> getBundleWidgetTypes(
+            @RequestParam boolean isSystem,
+            @RequestParam String bundleAlias) throws ThingsboardException {
+        try {
+            TenantId tenantId;
+            if (isSystem) {
+                tenantId = new TenantId(ModelConstants.NULL_UUID);
+            } else {
+                tenantId = getCurrentUser().getTenantId();
+            }
+            return checkNotNull(widgetTypeService.findWidgetTypesByTenantIdAndBundleAlias(tenantId, bundleAlias));
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/widgetType", params = { "isSystem", "bundleAlias", "alias" }, method = RequestMethod.GET)
+    @ResponseBody
+    public WidgetType getWidgetType(
+            @RequestParam boolean isSystem,
+            @RequestParam String bundleAlias,
+            @RequestParam String alias) throws ThingsboardException {
+        try {
+            TenantId tenantId;
+            if (isSystem) {
+                tenantId = new TenantId(ModelConstants.NULL_UUID);
+            } else {
+                tenantId = getCurrentUser().getTenantId();
+            }
+            WidgetType widgetType = widgetTypeService.findWidgetTypeByTenantIdBundleAliasAndAlias(tenantId, bundleAlias, alias);
+            checkWidgetType(widgetType, false);
+            return widgetType;
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorCode.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorCode.java
new file mode 100644
index 0000000..9c505f6
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorCode.java
@@ -0,0 +1,41 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.exception;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum ThingsboardErrorCode {
+
+    GENERAL(2),
+    AUTHENTICATION(10),
+    JWT_TOKEN_EXPIRED(11),
+    PERMISSION_DENIED(20),
+    INVALID_ARGUMENTS(30),
+    BAD_REQUEST_PARAMS(31),
+    ITEM_NOT_FOUND(32);
+
+    private int errorCode;
+
+    ThingsboardErrorCode(int errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    @JsonValue
+    public int getErrorCode() {
+        return errorCode;
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
new file mode 100644
index 0000000..9960a56
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponse.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.exception;
+
+import org.springframework.http.HttpStatus;
+
+import java.util.Date;
+
+public class ThingsboardErrorResponse {
+    // HTTP Response Status Code
+    private final HttpStatus status;
+
+    // General Error message
+    private final String message;
+
+    // Error code
+    private final ThingsboardErrorCode errorCode;
+
+    private final Date timestamp;
+
+    protected ThingsboardErrorResponse(final String message, final ThingsboardErrorCode errorCode, HttpStatus status) {
+        this.message = message;
+        this.errorCode = errorCode;
+        this.status = status;
+        this.timestamp = new java.util.Date();
+    }
+
+    public static ThingsboardErrorResponse of(final String message, final ThingsboardErrorCode errorCode, HttpStatus status) {
+        return new ThingsboardErrorResponse(message, errorCode, status);
+    }
+
+    public Integer getStatus() {
+        return status.value();
+    }
+
+    public String getMessage() {
+        return message;
+    }
+
+    public ThingsboardErrorCode getErrorCode() {
+        return errorCode;
+    }
+
+    public Date getTimestamp() {
+        return timestamp;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java
new file mode 100644
index 0000000..ad60ea2
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java
@@ -0,0 +1,133 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.exception;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
+import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+@Component
+@Slf4j
+public class ThingsboardErrorResponseHandler implements AccessDeniedHandler {
+
+    @Autowired
+    private ObjectMapper mapper;
+
+    @Override
+    public void handle(HttpServletRequest request, HttpServletResponse response,
+                       AccessDeniedException accessDeniedException) throws IOException,
+            ServletException {
+        if (!response.isCommitted()) {
+            response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+            response.setStatus(HttpStatus.FORBIDDEN.value());
+            mapper.writeValue(response.getWriter(),
+                    ThingsboardErrorResponse.of("You don't have permission to perform this operation!",
+                            ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN));
+        }
+    }
+
+    public void handle(Exception exception, HttpServletResponse response) {
+        log.debug("Processing exception {}", exception.getMessage(), exception);
+        if (!response.isCommitted()) {
+            try {
+                response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+
+                if (exception instanceof ThingsboardException) {
+                    handleThingsboardException((ThingsboardException) exception, response);
+                } else if (exception instanceof AccessDeniedException) {
+                    handleAccessDeniedException(response);
+                } else if (exception instanceof AuthenticationException) {
+                    handleAuthenticationException((AuthenticationException) exception, response);
+                } else {
+                    response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+                    mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(exception.getMessage(),
+                            ThingsboardErrorCode.GENERAL, HttpStatus.INTERNAL_SERVER_ERROR));
+                }
+            } catch (IOException e) {
+                log.error("Can't handle exception", e);
+            }
+        }
+    }
+
+    private void handleThingsboardException(ThingsboardException thingsboardException, HttpServletResponse response) throws IOException {
+
+        ThingsboardErrorCode errorCode = thingsboardException.getErrorCode();
+        HttpStatus status;
+
+        switch (errorCode) {
+            case AUTHENTICATION:
+                status = HttpStatus.UNAUTHORIZED;
+                break;
+            case PERMISSION_DENIED:
+                status = HttpStatus.FORBIDDEN;
+                break;
+            case INVALID_ARGUMENTS:
+                status = HttpStatus.BAD_REQUEST;
+                break;
+            case ITEM_NOT_FOUND:
+                status = HttpStatus.NOT_FOUND;
+                break;
+            case BAD_REQUEST_PARAMS:
+                status = HttpStatus.BAD_REQUEST;
+                break;
+            case GENERAL:
+                status = HttpStatus.INTERNAL_SERVER_ERROR;
+                break;
+            default:
+                status = HttpStatus.INTERNAL_SERVER_ERROR;
+                break;
+        }
+
+        response.setStatus(status.value());
+        mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(thingsboardException.getMessage(), errorCode, status));
+    }
+
+    private void handleAccessDeniedException(HttpServletResponse response) throws IOException {
+        response.setStatus(HttpStatus.FORBIDDEN.value());
+        mapper.writeValue(response.getWriter(),
+                ThingsboardErrorResponse.of("You don't have permission to perform this operation!",
+                        ThingsboardErrorCode.PERMISSION_DENIED, HttpStatus.FORBIDDEN));
+
+    }
+
+    private void handleAuthenticationException(AuthenticationException authenticationException, HttpServletResponse response) throws IOException {
+        response.setStatus(HttpStatus.UNAUTHORIZED.value());
+        if (authenticationException instanceof BadCredentialsException) {
+            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("Invalid username or password", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
+        } else if (authenticationException instanceof JwtExpiredTokenException) {
+            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("Token has expired", ThingsboardErrorCode.JWT_TOKEN_EXPIRED, HttpStatus.UNAUTHORIZED));
+        } else if (authenticationException instanceof AuthMethodNotSupportedException) {
+            mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(authenticationException.getMessage(), ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
+        }
+        mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of("Authentication failed", ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/exception/ThingsboardException.java b/application/src/main/java/org/thingsboard/server/exception/ThingsboardException.java
new file mode 100644
index 0000000..0da0414
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/exception/ThingsboardException.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.exception;
+
+public class ThingsboardException extends Exception {
+
+    private static final long serialVersionUID = 1L;
+
+    private ThingsboardErrorCode errorCode;
+
+    public ThingsboardException() {
+        super();
+    }
+
+    public ThingsboardException(ThingsboardErrorCode errorCode) {
+        this.errorCode = errorCode;
+    }
+
+    public ThingsboardException(String message, ThingsboardErrorCode errorCode) {
+        super(message);
+        this.errorCode = errorCode;
+    }
+
+    public ThingsboardException(String message, Throwable cause, ThingsboardErrorCode errorCode) {
+        super(message, cause);
+        this.errorCode = errorCode;
+    }
+
+    public ThingsboardException(Throwable cause, ThingsboardErrorCode errorCode) {
+        super(cause);
+        this.errorCode = errorCode;
+    }
+
+    public ThingsboardErrorCode getErrorCode() {
+        return errorCode;
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/environment/EnvironmentLogService.java b/application/src/main/java/org/thingsboard/server/service/environment/EnvironmentLogService.java
new file mode 100644
index 0000000..aae2d8d
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/environment/EnvironmentLogService.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.environment;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.zookeeper.Environment;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+
+/**
+ * Created by igor on 11/24/16.
+ */
+
+@Service("environmentLogService")
+@ConditionalOnProperty(prefix = "zk", value = "enabled", havingValue = "false", matchIfMissing = true)
+@Slf4j
+public class EnvironmentLogService {
+
+    @PostConstruct
+    public void init() {
+        Environment.logEnv("Thingsboard server environment: ", log);
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
new file mode 100644
index 0000000..b11517c
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/mail/DefaultMailService.java
@@ -0,0 +1,208 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.mail;
+
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.annotation.PostConstruct;
+import javax.mail.internet.MimeMessage;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.velocity.app.VelocityEngine;
+import org.thingsboard.server.exception.ThingsboardErrorCode;
+import org.thingsboard.server.exception.ThingsboardException;
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.dao.settings.AdminSettingsService;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.MessageSource;
+import org.springframework.core.NestedRuntimeException;
+import org.springframework.mail.javamail.JavaMailSenderImpl;
+import org.springframework.mail.javamail.MimeMessageHelper;
+import org.springframework.stereotype.Service;
+import org.springframework.ui.velocity.VelocityEngineUtils;
+
+import com.fasterxml.jackson.databind.JsonNode;
+@Service
+@Slf4j
+public class DefaultMailService implements MailService {
+
+    @Autowired
+    private MessageSource messages;
+    
+    @Autowired
+    private VelocityEngine engine;
+    
+    private JavaMailSenderImpl mailSender;
+    
+    private String mailFrom;
+    
+    @Autowired
+    private AdminSettingsService adminSettingsService; 
+    
+    @PostConstruct
+    private void init() {
+        updateMailConfiguration();
+    }
+
+    @Override
+    public void updateMailConfiguration() {
+        AdminSettings settings = adminSettingsService.findAdminSettingsByKey("mail");
+        JsonNode jsonConfig = settings.getJsonValue();
+        mailSender = createMailSender(jsonConfig);
+        mailFrom = jsonConfig.get("mailFrom").asText();
+    }
+    
+    private JavaMailSenderImpl createMailSender(JsonNode jsonConfig) {
+        JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
+        mailSender.setHost(jsonConfig.get("smtpHost").asText());
+        mailSender.setPort(parsePort(jsonConfig.get("smtpPort").asText()));
+        mailSender.setUsername(jsonConfig.get("username").asText());
+        mailSender.setPassword(jsonConfig.get("password").asText());
+        mailSender.setJavaMailProperties(createJavaMailProperties(jsonConfig));
+        return mailSender;
+    }
+
+    private Properties createJavaMailProperties(JsonNode jsonConfig) {
+        Properties javaMailProperties = new Properties();
+        String protocol = jsonConfig.get("smtpProtocol").asText();
+        javaMailProperties.put("mail.transport.protocol", protocol);
+        javaMailProperties.put("mail." + protocol + ".host", jsonConfig.get("smtpHost").asText());
+        javaMailProperties.put("mail." + protocol + ".port", jsonConfig.get("smtpPort").asText());
+        javaMailProperties.put("mail." + protocol + ".timeout", jsonConfig.get("timeout").asText());
+        javaMailProperties.put("mail." + protocol + ".auth", String.valueOf(StringUtils.isNotEmpty(jsonConfig.get("username").asText())));
+        javaMailProperties.put("mail." + protocol + ".starttls.enable", jsonConfig.get("enableTls"));
+        return javaMailProperties;
+    }
+    
+    private int parsePort(String strPort) {
+        try {
+            return Integer.valueOf(strPort);
+        } catch (NumberFormatException e) {
+            throw new IncorrectParameterException(String.format("Invalid smtp port value: %s", strPort));
+        }
+    }
+    
+    @Override
+    public void sendTestMail(JsonNode jsonConfig, String email) throws ThingsboardException {
+        JavaMailSenderImpl testMailSender = createMailSender(jsonConfig);
+        String mailFrom = jsonConfig.get("mailFrom").asText();
+        String subject = messages.getMessage("test.message.subject", null, Locale.US);
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("targetEmail", email);
+        
+        String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine,
+                "test.vm", "UTF-8", model);
+        
+        sendMail(testMailSender, mailFrom, email, subject, message); 
+    }
+
+    @Override
+    public void sendActivationEmail(String activationLink, String email) throws ThingsboardException {
+        
+        String subject = messages.getMessage("activation.subject", null, Locale.US);
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("activationLink", activationLink);
+        model.put("targetEmail", email);
+        
+        String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine,
+                "activation.vm", "UTF-8", model);
+        
+        sendMail(mailSender, mailFrom, email, subject, message); 
+    }
+    
+    @Override
+    public void sendAccountActivatedEmail(String loginLink, String email) throws ThingsboardException {
+        
+        String subject = messages.getMessage("account.activated.subject", null, Locale.US);
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("loginLink", loginLink);
+        model.put("targetEmail", email);
+        
+        String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine,
+                "account.activated.vm", "UTF-8", model);
+        
+        sendMail(mailSender, mailFrom, email, subject, message); 
+    }
+
+    @Override
+    public void sendResetPasswordEmail(String passwordResetLink, String email) throws ThingsboardException {
+        
+        String subject = messages.getMessage("reset.password.subject", null, Locale.US);
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("passwordResetLink", passwordResetLink);
+        model.put("targetEmail", email);
+        
+        String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine,
+                "reset.password.vm", "UTF-8", model);
+        
+        sendMail(mailSender, mailFrom, email, subject, message); 
+    }
+    
+    @Override
+    public void sendPasswordWasResetEmail(String loginLink, String email) throws ThingsboardException {
+        
+        String subject = messages.getMessage("password.was.reset.subject", null, Locale.US);
+        
+        Map<String, Object> model = new HashMap<String, Object>();
+        model.put("loginLink", loginLink);
+        model.put("targetEmail", email);
+        
+        String message = VelocityEngineUtils.mergeTemplateIntoString(this.engine,
+                "password.was.reset.vm", "UTF-8", model);
+        
+        sendMail(mailSender, mailFrom, email, subject, message); 
+    }
+
+
+    private void sendMail(JavaMailSenderImpl mailSender, 
+            String mailFrom, String email, 
+            String subject, String message) throws ThingsboardException {
+        try {
+            MimeMessage mimeMsg = mailSender.createMimeMessage();
+            MimeMessageHelper helper = new MimeMessageHelper(mimeMsg, "UTF-8");
+            helper.setFrom(mailFrom);
+            helper.setTo(email);
+            helper.setSubject(subject);
+            helper.setText(message, true);
+            mailSender.send(helper.getMimeMessage());
+        } catch (Exception e) {
+            throw handleException(e);
+        }
+    }
+
+    protected ThingsboardException handleException(Exception exception) {
+        String message;
+        if (exception instanceof NestedRuntimeException) {
+            message = ((NestedRuntimeException)exception).getMostSpecificCause().getMessage();
+        } else {
+            message = exception.getMessage();
+        }
+        return new ThingsboardException(String.format("Unable to send mail: %s", message),
+                ThingsboardErrorCode.GENERAL);
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/mail/MailService.java b/application/src/main/java/org/thingsboard/server/service/mail/MailService.java
new file mode 100644
index 0000000..e135253
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/mail/MailService.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.mail;
+
+import org.thingsboard.server.exception.ThingsboardException;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+public interface MailService {
+
+    void updateMailConfiguration();
+    
+    void sendTestMail(JsonNode config, String email) throws ThingsboardException;
+    
+    void sendActivationEmail(String activationLink, String email) throws ThingsboardException;
+    
+    void sendAccountActivatedEmail(String loginLink, String email) throws ThingsboardException;
+    
+    void sendResetPasswordEmail(String passwordResetLink, String email) throws ThingsboardException;
+    
+    void sendPasswordWasResetEmail(String loginLink, String email) throws ThingsboardException;
+    
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/AbstractJwtAuthenticationToken.java b/application/src/main/java/org/thingsboard/server/service/security/auth/AbstractJwtAuthenticationToken.java
new file mode 100644
index 0000000..eb6541f
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/AbstractJwtAuthenticationToken.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth;
+
+import org.springframework.security.authentication.AbstractAuthenticationToken;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
+
+public abstract class AbstractJwtAuthenticationToken extends AbstractAuthenticationToken {
+
+    private static final long serialVersionUID = -6212297506742428406L;
+
+    private RawAccessJwtToken rawAccessToken;
+    private SecurityUser securityUser;
+
+    public AbstractJwtAuthenticationToken(RawAccessJwtToken unsafeToken) {
+        super(null);
+        this.rawAccessToken = unsafeToken;
+        this.setAuthenticated(false);
+    }
+
+    public AbstractJwtAuthenticationToken(SecurityUser securityUser) {
+        super(securityUser.getAuthorities());
+        this.eraseCredentials();
+        this.securityUser = securityUser;
+        super.setAuthenticated(true);
+    }
+
+    @Override
+    public void setAuthenticated(boolean authenticated) {
+        if (authenticated) {
+            throw new IllegalArgumentException(
+                    "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead");
+        }
+        super.setAuthenticated(false);
+    }
+
+    @Override
+    public Object getCredentials() {
+        return rawAccessToken;
+    }
+
+    @Override
+    public Object getPrincipal() {
+        return this.securityUser;
+    }
+
+    @Override
+    public void eraseCredentials() {
+        super.eraseCredentials();
+        this.rawAccessToken = null;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtHeaderTokenExtractor.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtHeaderTokenExtractor.java
new file mode 100644
index 0000000..9b60882
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtHeaderTokenExtractor.java
@@ -0,0 +1,42 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt.extractor;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.authentication.AuthenticationServiceException;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.config.ThingsboardSecurityConfiguration;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Component(value="jwtHeaderTokenExtractor")
+public class JwtHeaderTokenExtractor implements TokenExtractor {
+    public static String HEADER_PREFIX = "Bearer ";
+
+    @Override
+    public String extract(HttpServletRequest request) {
+        String header = request.getHeader(ThingsboardSecurityConfiguration.JWT_TOKEN_HEADER_PARAM);
+        if (StringUtils.isBlank(header)) {
+            throw new AuthenticationServiceException("Authorization header cannot be blank!");
+        }
+
+        if (header.length() < HEADER_PREFIX.length()) {
+            throw new AuthenticationServiceException("Invalid authorization header size.");
+        }
+
+        return header.substring(HEADER_PREFIX.length(), header.length());
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtQueryTokenExtractor.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtQueryTokenExtractor.java
new file mode 100644
index 0000000..d8a8370
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/JwtQueryTokenExtractor.java
@@ -0,0 +1,43 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt.extractor;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.authentication.AuthenticationServiceException;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.config.ThingsboardSecurityConfiguration;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Component(value="jwtQueryTokenExtractor")
+public class JwtQueryTokenExtractor implements TokenExtractor {
+
+    @Override
+    public String extract(HttpServletRequest request) {
+        String token = null;
+        if (request.getParameterMap() != null && !request.getParameterMap().isEmpty()) {
+            String[] tokenParamValue = request.getParameterMap().get(ThingsboardSecurityConfiguration.JWT_TOKEN_QUERY_PARAM);
+            if (tokenParamValue != null && tokenParamValue.length == 1) {
+                token = tokenParamValue[0];
+            }
+        }
+        if (StringUtils.isBlank(token)) {
+            throw new AuthenticationServiceException("Authorization query parameter cannot be blank!");
+        }
+
+        return token;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/TokenExtractor.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/TokenExtractor.java
new file mode 100644
index 0000000..74c6dea
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/extractor/TokenExtractor.java
@@ -0,0 +1,22 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt.extractor;
+
+import javax.servlet.http.HttpServletRequest;
+
+public interface TokenExtractor {
+    public String extract(HttpServletRequest request);
+}
\ No newline at end of file

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtAuthenticationProvider.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtAuthenticationProvider.java
new file mode 100644
index 0000000..d02019c
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtAuthenticationProvider.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.config.JwtSettings;
+import org.thingsboard.server.service.security.auth.JwtAuthenticationToken;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
+import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+@SuppressWarnings("unchecked")
+public class JwtAuthenticationProvider implements AuthenticationProvider {
+
+    private final JwtTokenFactory tokenFactory;
+
+    @Autowired
+    public JwtAuthenticationProvider(JwtTokenFactory tokenFactory) {
+        this.tokenFactory = tokenFactory;
+    }
+
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        RawAccessJwtToken rawAccessToken = (RawAccessJwtToken) authentication.getCredentials();
+        SecurityUser securityUser = tokenFactory.parseAccessJwtToken(rawAccessToken);
+        return new JwtAuthenticationToken(securityUser);
+    }
+
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return (JwtAuthenticationToken.class.isAssignableFrom(authentication));
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtTokenAuthenticationProcessingFilter.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtTokenAuthenticationProcessingFilter.java
new file mode 100644
index 0000000..523a670
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/JwtTokenAuthenticationProcessingFilter.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.security.web.util.matcher.RequestMatcher;
+import org.thingsboard.server.config.ThingsboardSecurityConfiguration;
+import org.thingsboard.server.service.security.auth.JwtAuthenticationToken;
+import org.thingsboard.server.service.security.auth.jwt.extractor.TokenExtractor;
+import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class JwtTokenAuthenticationProcessingFilter extends AbstractAuthenticationProcessingFilter {
+    private final AuthenticationFailureHandler failureHandler;
+    private final TokenExtractor tokenExtractor;
+
+    @Autowired
+    public JwtTokenAuthenticationProcessingFilter(AuthenticationFailureHandler failureHandler,
+                                                  TokenExtractor tokenExtractor, RequestMatcher matcher) {
+        super(matcher);
+        this.failureHandler = failureHandler;
+        this.tokenExtractor = tokenExtractor;
+    }
+
+    @Override
+    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
+            throws AuthenticationException, IOException, ServletException {
+        RawAccessJwtToken token = new RawAccessJwtToken(tokenExtractor.extract(request));
+        return getAuthenticationManager().authenticate(new JwtAuthenticationToken(token));
+    }
+
+    @Override
+    protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
+                                            Authentication authResult) throws IOException, ServletException {
+        SecurityContext context = SecurityContextHolder.createEmptyContext();
+        context.setAuthentication(authResult);
+        SecurityContextHolder.setContext(context);
+        chain.doFilter(request, response);
+    }
+
+    @Override
+    protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
+                                              AuthenticationException failed) throws IOException, ServletException {
+        SecurityContextHolder.clearContext();
+        failureHandler.onAuthenticationFailure(request, response, failed);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java
new file mode 100644
index 0000000..e044ef4
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenAuthenticationProvider.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.DisabledException;
+import org.springframework.security.authentication.InsufficientAuthenticationException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.service.security.auth.RefreshAuthenticationToken;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
+import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
+
+@Component
+public class RefreshTokenAuthenticationProvider implements AuthenticationProvider {
+
+    private final JwtTokenFactory tokenFactory;
+    private final UserService userService;
+
+    @Autowired
+    public RefreshTokenAuthenticationProvider(final UserService userService, final JwtTokenFactory tokenFactory) {
+        this.userService = userService;
+        this.tokenFactory = tokenFactory;
+    }
+
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        Assert.notNull(authentication, "No authentication data provided");
+        RawAccessJwtToken rawAccessToken = (RawAccessJwtToken) authentication.getCredentials();
+        SecurityUser unsafeUser = tokenFactory.parseRefreshToken(rawAccessToken);
+
+        User user = userService.findUserById(unsafeUser.getId());
+        if (user == null) {
+            throw new UsernameNotFoundException("User not found by refresh token");
+        }
+
+        UserCredentials userCredentials = userService.findUserCredentialsByUserId(user.getId());
+        if (userCredentials == null) {
+            throw new UsernameNotFoundException("User credentials not found");
+        }
+
+        if (!userCredentials.isEnabled()) {
+            throw new DisabledException("User is not active");
+        }
+
+        if (user.getAuthority() == null) throw new InsufficientAuthenticationException("User has no authority assigned");
+
+        SecurityUser securityUser = new SecurityUser(user, userCredentials.isEnabled());
+
+        return new RefreshAuthenticationToken(securityUser);
+    }
+
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return (RefreshAuthenticationToken.class.isAssignableFrom(authentication));
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenProcessingFilter.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenProcessingFilter.java
new file mode 100644
index 0000000..354b68e
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenProcessingFilter.java
@@ -0,0 +1,94 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationServiceException;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.thingsboard.server.service.security.auth.RefreshAuthenticationToken;
+import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
+import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class RefreshTokenProcessingFilter extends AbstractAuthenticationProcessingFilter {
+    private static Logger logger = LoggerFactory.getLogger(RefreshTokenProcessingFilter.class);
+
+    private final AuthenticationSuccessHandler successHandler;
+    private final AuthenticationFailureHandler failureHandler;
+
+    private final ObjectMapper objectMapper;
+
+    public RefreshTokenProcessingFilter(String defaultProcessUrl, AuthenticationSuccessHandler successHandler,
+                                        AuthenticationFailureHandler failureHandler, ObjectMapper mapper) {
+        super(defaultProcessUrl);
+        this.successHandler = successHandler;
+        this.failureHandler = failureHandler;
+        this.objectMapper = mapper;
+    }
+
+    @Override
+    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
+            throws AuthenticationException, IOException, ServletException {
+        if (!HttpMethod.POST.name().equals(request.getMethod())) {
+            if(logger.isDebugEnabled()) {
+                logger.debug("Authentication method not supported. Request method: " + request.getMethod());
+            }
+            throw new AuthMethodNotSupportedException("Authentication method not supported");
+        }
+
+        RefreshTokenRequest refreshTokenRequest;
+        try {
+            refreshTokenRequest = objectMapper.readValue(request.getReader(), RefreshTokenRequest.class);
+        } catch (Exception e) {
+            throw new AuthenticationServiceException("Invalid refresh token request payload");
+        }
+
+        if (StringUtils.isBlank(refreshTokenRequest.getRefreshToken())) {
+            throw new AuthenticationServiceException("Refresh token is not provided");
+        }
+
+        RawAccessJwtToken token = new RawAccessJwtToken(refreshTokenRequest.getRefreshToken());
+
+        return this.getAuthenticationManager().authenticate(new RefreshAuthenticationToken(token));
+    }
+
+    @Override
+    protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
+                                            Authentication authResult) throws IOException, ServletException {
+        successHandler.onAuthenticationSuccess(request, response, authResult);
+    }
+
+    @Override
+    protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
+                                              AuthenticationException failed) throws IOException, ServletException {
+        SecurityContextHolder.clearContext();
+        failureHandler.onAuthenticationFailure(request, response, failed);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenRepository.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenRepository.java
new file mode 100644
index 0000000..06237d8
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenRepository.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.token.JwtToken;
+import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
+
+@Component
+public class RefreshTokenRepository {
+
+    private final JwtTokenFactory tokenFactory;
+
+    @Autowired
+    public RefreshTokenRepository(final JwtTokenFactory tokenFactory) {
+        this.tokenFactory = tokenFactory;
+    }
+
+    public JwtToken requestRefreshToken(SecurityUser user) {
+        return tokenFactory.createRefreshToken(user);
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenRequest.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenRequest.java
new file mode 100644
index 0000000..4a14972
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/RefreshTokenRequest.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class RefreshTokenRequest {
+    private String refreshToken;
+
+    @JsonCreator
+    public RefreshTokenRequest(@JsonProperty("refreshToken") String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/SkipPathRequestMatcher.java b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/SkipPathRequestMatcher.java
new file mode 100644
index 0000000..9710cf6
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/jwt/SkipPathRequestMatcher.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.jwt;
+
+import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
+import org.springframework.security.web.util.matcher.OrRequestMatcher;
+import org.springframework.security.web.util.matcher.RequestMatcher;
+import org.springframework.util.Assert;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class SkipPathRequestMatcher implements RequestMatcher {
+    private OrRequestMatcher matchers;
+    private RequestMatcher processingMatcher;
+
+    public SkipPathRequestMatcher(List<String> pathsToSkip, String processingPath) {
+        Assert.notNull(pathsToSkip);
+        List<RequestMatcher> m = pathsToSkip.stream().map(path -> new AntPathRequestMatcher(path)).collect(Collectors.toList());
+        matchers = new OrRequestMatcher(m);
+        processingMatcher = new AntPathRequestMatcher(processingPath);
+    }
+
+    @Override
+    public boolean matches(HttpServletRequest request) {
+        if (matchers.matches(request)) {
+            return false;
+        }
+        return processingMatcher.matches(request) ? true : false;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/JwtAuthenticationToken.java b/application/src/main/java/org/thingsboard/server/service/security/auth/JwtAuthenticationToken.java
new file mode 100644
index 0000000..688ca19
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/JwtAuthenticationToken.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth;
+
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
+
+public class JwtAuthenticationToken extends AbstractJwtAuthenticationToken {
+
+    private static final long serialVersionUID = -8487219769037942225L;
+
+    public JwtAuthenticationToken(RawAccessJwtToken unsafeToken) {
+        super(unsafeToken);
+    }
+
+    public JwtAuthenticationToken(SecurityUser securityUser) {
+        super(securityUser);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/RefreshAuthenticationToken.java b/application/src/main/java/org/thingsboard/server/service/security/auth/RefreshAuthenticationToken.java
new file mode 100644
index 0000000..6f927c1
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/RefreshAuthenticationToken.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth;
+
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.token.RawAccessJwtToken;
+
+public class RefreshAuthenticationToken extends AbstractJwtAuthenticationToken {
+
+    private static final long serialVersionUID = -1311042791508924523L;
+
+    public RefreshAuthenticationToken(RawAccessJwtToken unsafeToken) {
+        super(unsafeToken);
+    }
+
+    public RefreshAuthenticationToken(SecurityUser securityUser) {
+        super(securityUser);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java
new file mode 100644
index 0000000..b00506f
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/LoginRequest.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.rest;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class LoginRequest {
+    private String username;
+    private String password;
+
+    @JsonCreator
+    public LoginRequest(@JsonProperty("username") String username, @JsonProperty("password") String password) {
+        this.username = username;
+        this.password = password;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java
new file mode 100644
index 0000000..bcc9588
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAuthenticationProvider.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.rest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.authentication.*;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+@Component
+public class RestAuthenticationProvider implements AuthenticationProvider {
+
+    private final BCryptPasswordEncoder encoder;
+    private final UserService userService;
+
+    @Autowired
+    public RestAuthenticationProvider(final UserService userService, final BCryptPasswordEncoder encoder) {
+        this.userService = userService;
+        this.encoder = encoder;
+    }
+
+    @Override
+    public Authentication authenticate(Authentication authentication) throws AuthenticationException {
+        Assert.notNull(authentication, "No authentication data provided");
+
+        String username = (String) authentication.getPrincipal();
+        String password = (String) authentication.getCredentials();
+
+        User user = userService.findUserByEmail(username);
+        if (user == null) {
+            throw new UsernameNotFoundException("User not found: " + username);
+        }
+
+        UserCredentials userCredentials = userService.findUserCredentialsByUserId(user.getId());
+        if (userCredentials == null) {
+            throw new UsernameNotFoundException("User credentials not found");
+        }
+
+        if (!userCredentials.isEnabled()) {
+            throw new DisabledException("User is not active");
+        }
+
+        if (!encoder.matches(password, userCredentials.getPassword())) {
+            throw new BadCredentialsException("Authentication Failed. Username or Password not valid.");
+        }
+
+        if (user.getAuthority() == null) throw new InsufficientAuthenticationException("User has no authority assigned");
+
+        SecurityUser securityUser = new SecurityUser(user, userCredentials.isEnabled());
+
+        return new UsernamePasswordAuthenticationToken(securityUser, null, securityUser.getAuthorities());
+    }
+
+    @Override
+    public boolean supports(Class<?> authentication) {
+        return (UsernamePasswordAuthenticationToken.class.isAssignableFrom(authentication));
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationFailureHandler.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationFailureHandler.java
new file mode 100644
index 0000000..879a17c
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationFailureHandler.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.rest;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.exception.ThingsboardErrorResponseHandler;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class RestAwareAuthenticationFailureHandler implements AuthenticationFailureHandler {
+
+    private final ThingsboardErrorResponseHandler errorResponseHandler;
+
+    @Autowired
+    public RestAwareAuthenticationFailureHandler(ThingsboardErrorResponseHandler errorResponseHandler) {
+        this.errorResponseHandler = errorResponseHandler;
+    }
+
+    @Override
+    public void onAuthenticationFailure(HttpServletRequest request, HttpServletResponse response,
+                                        AuthenticationException e) throws IOException, ServletException {
+        errorResponseHandler.handle(e, response);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationSuccessHandler.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationSuccessHandler.java
new file mode 100644
index 0000000..72c7719
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestAwareAuthenticationSuccessHandler.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.rest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.WebAttributes;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.service.security.auth.jwt.RefreshTokenRepository;
+import org.thingsboard.server.service.security.model.SecurityUser;
+import org.thingsboard.server.service.security.model.token.JwtToken;
+import org.thingsboard.server.service.security.model.token.JwtTokenFactory;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+@Component
+public class RestAwareAuthenticationSuccessHandler implements AuthenticationSuccessHandler {
+    private final ObjectMapper mapper;
+    private final JwtTokenFactory tokenFactory;
+    private final RefreshTokenRepository refreshTokenRepository;
+
+    @Autowired
+    public RestAwareAuthenticationSuccessHandler(final ObjectMapper mapper, final JwtTokenFactory tokenFactory, final RefreshTokenRepository refreshTokenRepository) {
+        this.mapper = mapper;
+        this.tokenFactory = tokenFactory;
+        this.refreshTokenRepository = refreshTokenRepository;
+    }
+
+    @Override
+    public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response,
+                                        Authentication authentication) throws IOException, ServletException {
+        SecurityUser securityUser = (SecurityUser) authentication.getPrincipal();
+
+        JwtToken accessToken = tokenFactory.createAccessJwtToken(securityUser);
+        JwtToken refreshToken = refreshTokenRepository.requestRefreshToken(securityUser);
+
+        Map<String, String> tokenMap = new HashMap<String, String>();
+        tokenMap.put("token", accessToken.getToken());
+        tokenMap.put("refreshToken", refreshToken.getToken());
+
+        response.setStatus(HttpStatus.OK.value());
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+        mapper.writeValue(response.getWriter(), tokenMap);
+
+        clearAuthenticationAttributes(request);
+    }
+
+    /**
+     * Removes temporary authentication-related data which may have been stored
+     * in the session during the authentication process..
+     *
+     */
+    protected final void clearAuthenticationAttributes(HttpServletRequest request) {
+        HttpSession session = request.getSession(false);
+
+        if (session == null) {
+            return;
+        }
+
+        session.removeAttribute(WebAttributes.AUTHENTICATION_EXCEPTION);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestLoginProcessingFilter.java b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestLoginProcessingFilter.java
new file mode 100644
index 0000000..ba6431e
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/auth/rest/RestLoginProcessingFilter.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.auth.rest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpMethod;
+import org.springframework.security.authentication.AuthenticationServiceException;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.AbstractAuthenticationProcessingFilter;
+import org.springframework.security.web.authentication.AuthenticationFailureHandler;
+import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
+import org.thingsboard.server.service.security.exception.AuthMethodNotSupportedException;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+public class RestLoginProcessingFilter extends AbstractAuthenticationProcessingFilter {
+    private static Logger logger = LoggerFactory.getLogger(RestLoginProcessingFilter.class);
+
+    private final AuthenticationSuccessHandler successHandler;
+    private final AuthenticationFailureHandler failureHandler;
+
+    private final ObjectMapper objectMapper;
+
+    public RestLoginProcessingFilter(String defaultProcessUrl, AuthenticationSuccessHandler successHandler,
+                                     AuthenticationFailureHandler failureHandler, ObjectMapper mapper) {
+        super(defaultProcessUrl);
+        this.successHandler = successHandler;
+        this.failureHandler = failureHandler;
+        this.objectMapper = mapper;
+    }
+
+    @Override
+    public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response)
+            throws AuthenticationException, IOException, ServletException {
+        if (!HttpMethod.POST.name().equals(request.getMethod())) {
+            if(logger.isDebugEnabled()) {
+                logger.debug("Authentication method not supported. Request method: " + request.getMethod());
+            }
+            throw new AuthMethodNotSupportedException("Authentication method not supported");
+        }
+
+        LoginRequest loginRequest;
+        try {
+            loginRequest = objectMapper.readValue(request.getReader(), LoginRequest.class);
+        } catch (Exception e) {
+            throw new AuthenticationServiceException("Invalid login request payload");
+        }
+
+        if (StringUtils.isBlank(loginRequest.getUsername()) || StringUtils.isBlank(loginRequest.getPassword())) {
+            throw new AuthenticationServiceException("Username or Password not provided");
+        }
+
+        UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(loginRequest.getUsername(), loginRequest.getPassword());
+
+        return this.getAuthenticationManager().authenticate(token);
+    }
+
+    @Override
+    protected void successfulAuthentication(HttpServletRequest request, HttpServletResponse response, FilterChain chain,
+                                            Authentication authResult) throws IOException, ServletException {
+        successHandler.onAuthenticationSuccess(request, response, authResult);
+    }
+
+    @Override
+    protected void unsuccessfulAuthentication(HttpServletRequest request, HttpServletResponse response,
+                                              AuthenticationException failed) throws IOException, ServletException {
+        SecurityContextHolder.clearContext();
+        failureHandler.onAuthenticationFailure(request, response, failed);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/device/DefaultDeviceAuthService.java b/application/src/main/java/org/thingsboard/server/service/security/device/DefaultDeviceAuthService.java
new file mode 100644
index 0000000..cef73fe
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/device/DefaultDeviceAuthService.java
@@ -0,0 +1,70 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.device;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.data.security.DeviceCredentialsFilter;
+import org.thingsboard.server.common.transport.auth.DeviceAuthResult;
+import org.thingsboard.server.common.transport.auth.DeviceAuthService;
+import org.thingsboard.server.dao.device.DeviceCredentialsService;
+import org.thingsboard.server.dao.device.DeviceService;
+
+import java.util.Optional;
+
+@Service
+@Slf4j
+public class DefaultDeviceAuthService implements DeviceAuthService {
+
+    @Autowired
+    DeviceService deviceService;
+
+    @Autowired
+    DeviceCredentialsService deviceCredentialsService;
+
+    @Override
+    public DeviceAuthResult process(DeviceCredentialsFilter credentialsFilter) {
+        log.trace("Lookup device credentials using filter {}", credentialsFilter);
+        DeviceCredentials credentials = deviceCredentialsService.findDeviceCredentialsByCredentialsId(credentialsFilter.getCredentialsId());
+        if (credentials != null) {
+            log.trace("Credentials found {}", credentials);
+            if (credentials.getCredentialsType() == credentialsFilter.getCredentialsType()) {
+                switch (credentials.getCredentialsType()) {
+                    case ACCESS_TOKEN:
+                        // Credentials ID matches Credentials value in this
+                        // primitive case;
+                        return DeviceAuthResult.of(credentials.getDeviceId());
+                    default:
+                        return DeviceAuthResult.of("Credentials Type is not supported yet!");
+                }
+            } else {
+                return DeviceAuthResult.of("Credentials Type mismatch!");
+            }
+        } else {
+            log.trace("Credentials not found!");
+            return DeviceAuthResult.of("Credentials Not Found!");
+        }
+    }
+
+    @Override
+    public Optional<Device> findDeviceById(DeviceId deviceId) {
+        return Optional.ofNullable(deviceService.findDeviceById(deviceId));
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/exception/AuthMethodNotSupportedException.java b/application/src/main/java/org/thingsboard/server/service/security/exception/AuthMethodNotSupportedException.java
new file mode 100644
index 0000000..4444870
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/exception/AuthMethodNotSupportedException.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.exception;
+
+import org.springframework.security.authentication.AuthenticationServiceException;
+
+public class AuthMethodNotSupportedException extends AuthenticationServiceException {
+    private static final long serialVersionUID = 3705043083010304496L;
+
+    public AuthMethodNotSupportedException(String msg) {
+        super(msg);
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/exception/JwtExpiredTokenException.java b/application/src/main/java/org/thingsboard/server/service/security/exception/JwtExpiredTokenException.java
new file mode 100644
index 0000000..a3c522c
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/exception/JwtExpiredTokenException.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.exception;
+
+import org.springframework.security.core.AuthenticationException;
+import org.thingsboard.server.service.security.model.token.JwtToken;
+
+public class JwtExpiredTokenException extends AuthenticationException {
+    private static final long serialVersionUID = -5959543783324224864L;
+
+    private JwtToken token;
+
+    public JwtExpiredTokenException(String msg) {
+        super(msg);
+    }
+
+    public JwtExpiredTokenException(JwtToken token, String msg, Throwable t) {
+        super(msg, t);
+        this.token = token;
+    }
+
+    public String token() {
+        return this.token.getToken();
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java b/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java
new file mode 100644
index 0000000..83b87ab
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/SecurityUser.java
@@ -0,0 +1,64 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.model;
+
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.UserId;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+public class SecurityUser extends User {
+
+    private static final long serialVersionUID = -797397440703066079L;
+
+    private Collection<GrantedAuthority> authorities;
+    private boolean enabled;
+
+    public SecurityUser() {
+        super();
+    }
+
+    public SecurityUser(UserId id) {
+        super(id);
+    }
+
+    public SecurityUser(User user, boolean enabled) {
+        super(user);
+        this.enabled = enabled;
+    }
+
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        if (authorities == null) {
+            authorities = Arrays.asList(SecurityUser.this.getAuthority()).stream()
+                    .map(authority -> new SimpleGrantedAuthority(authority.name()))
+                    .collect(Collectors.toList());
+        }
+        return authorities;
+    }
+
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/AccessJwtToken.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/AccessJwtToken.java
new file mode 100644
index 0000000..9145937
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/AccessJwtToken.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.model.token;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.jsonwebtoken.Claims;
+
+public final class AccessJwtToken implements JwtToken {
+    private final String rawToken;
+    @JsonIgnore
+    private Claims claims;
+
+    protected AccessJwtToken(final String token, Claims claims) {
+        this.rawToken = token;
+        this.claims = claims;
+    }
+
+    public String getToken() {
+        return this.rawToken;
+    }
+
+    public Claims getClaims() {
+        return claims;
+    }
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtToken.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtToken.java
new file mode 100644
index 0000000..0e43fdf
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtToken.java
@@ -0,0 +1,20 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.model.token;
+
+public interface JwtToken {
+    String getToken();
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
new file mode 100644
index 0000000..0ce6181
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/JwtTokenFactory.java
@@ -0,0 +1,158 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.model.token;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jws;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.config.JwtSettings;
+import org.thingsboard.server.service.security.model.SecurityUser;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+@Component
+public class JwtTokenFactory {
+
+    private static final String SCOPES = "scopes";
+    private static final String USER_ID = "userId";
+    private static final String FIRST_NAME = "firstName";
+    private static final String LAST_NAME = "lastName";
+    private static final String ENABLED = "enabled";
+    private static final String TENANT_ID = "tenantId";
+    private static final String CUSTOMER_ID = "customerId";
+
+    private final JwtSettings settings;
+
+    @Autowired
+    public JwtTokenFactory(JwtSettings settings) {
+        this.settings = settings;
+    }
+
+    /**
+     * Factory method for issuing new JWT Tokens.
+     */
+    public AccessJwtToken createAccessJwtToken(SecurityUser securityUser) {
+        if (StringUtils.isBlank(securityUser.getEmail()))
+            throw new IllegalArgumentException("Cannot create JWT Token without username/email");
+
+        if (securityUser.getAuthority() == null)
+            throw new IllegalArgumentException("User doesn't have any privileges");
+
+        Claims claims = Jwts.claims().setSubject(securityUser.getEmail());
+        claims.put(SCOPES, securityUser.getAuthorities().stream().map(s -> s.getAuthority()).collect(Collectors.toList()));
+        claims.put(USER_ID, securityUser.getId().getId().toString());
+        claims.put(FIRST_NAME, securityUser.getFirstName());
+        claims.put(LAST_NAME, securityUser.getLastName());
+        claims.put(ENABLED, securityUser.isEnabled());
+        if (securityUser.getTenantId() != null) {
+            claims.put(TENANT_ID, securityUser.getTenantId().getId().toString());
+        }
+        if (securityUser.getCustomerId() != null) {
+            claims.put(CUSTOMER_ID, securityUser.getCustomerId().getId().toString());
+        }
+
+        DateTime currentTime = new DateTime();
+
+        String token = Jwts.builder()
+                .setClaims(claims)
+                .setIssuer(settings.getTokenIssuer())
+                .setIssuedAt(currentTime.toDate())
+                .setExpiration(currentTime.plusSeconds(settings.getTokenExpirationTime()).toDate())
+                .signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
+                .compact();
+
+        return new AccessJwtToken(token, claims);
+    }
+
+    public SecurityUser parseAccessJwtToken(RawAccessJwtToken rawAccessToken) {
+        Jws<Claims> jwsClaims = rawAccessToken.parseClaims(settings.getTokenSigningKey());
+        Claims claims = jwsClaims.getBody();
+        String subject = claims.getSubject();
+        List<String> scopes = claims.get(SCOPES, List.class);
+        if (scopes == null || scopes.isEmpty()) {
+            throw new IllegalArgumentException("JWT Token doesn't have any scopes");
+        }
+
+        SecurityUser securityUser = new SecurityUser(new UserId(UUID.fromString(claims.get(USER_ID, String.class))));
+        securityUser.setEmail(subject);
+        securityUser.setAuthority(Authority.parse(scopes.get(0)));
+        securityUser.setFirstName(claims.get(FIRST_NAME, String.class));
+        securityUser.setLastName(claims.get(LAST_NAME, String.class));
+        securityUser.setEnabled(claims.get(ENABLED, Boolean.class));
+        String tenantId = claims.get(TENANT_ID, String.class);
+        if (tenantId != null) {
+            securityUser.setTenantId(new TenantId(UUID.fromString(tenantId)));
+        }
+        String customerId = claims.get(CUSTOMER_ID, String.class);
+        if (customerId != null) {
+            securityUser.setCustomerId(new CustomerId(UUID.fromString(customerId)));
+        }
+
+        return securityUser;
+    }
+
+    public JwtToken createRefreshToken(SecurityUser securityUser) {
+        if (StringUtils.isBlank(securityUser.getEmail())) {
+            throw new IllegalArgumentException("Cannot create JWT Token without username/email");
+        }
+
+        DateTime currentTime = new DateTime();
+
+        Claims claims = Jwts.claims().setSubject(securityUser.getEmail());
+        claims.put(SCOPES, Arrays.asList(Authority.REFRESH_TOKEN.name()));
+        claims.put(USER_ID, securityUser.getId().getId().toString());
+
+        String token = Jwts.builder()
+                .setClaims(claims)
+                .setIssuer(settings.getTokenIssuer())
+                .setId(UUID.randomUUID().toString())
+                .setIssuedAt(currentTime.toDate())
+                .setExpiration(currentTime.plusSeconds(settings.getRefreshTokenExpTime()).toDate())
+                .signWith(SignatureAlgorithm.HS512, settings.getTokenSigningKey())
+                .compact();
+
+        return new AccessJwtToken(token, claims);
+    }
+
+    public SecurityUser parseRefreshToken(RawAccessJwtToken rawAccessToken) {
+        Jws<Claims> jwsClaims = rawAccessToken.parseClaims(settings.getTokenSigningKey());
+        Claims claims = jwsClaims.getBody();
+        String subject = claims.getSubject();
+        List<String> scopes = claims.get(SCOPES, List.class);
+        if (scopes == null || scopes.isEmpty()) {
+            throw new IllegalArgumentException("Refresh Token doesn't have any scopes");
+        }
+        if (!scopes.get(0).equals(Authority.REFRESH_TOKEN.name())) {
+            throw new IllegalArgumentException("Invalid Refresh Token scope");
+        }
+        SecurityUser securityUser = new SecurityUser(new UserId(UUID.fromString(claims.get(USER_ID, String.class))));
+        securityUser.setEmail(subject);
+        return securityUser;
+    }
+
+}

diff --git a/application/src/main/java/org/thingsboard/server/service/security/model/token/RawAccessJwtToken.java b/application/src/main/java/org/thingsboard/server/service/security/model/token/RawAccessJwtToken.java
new file mode 100644
index 0000000..cf32374
--- /dev/null
+++ b/application/src/main/java/org/thingsboard/server/service/security/model/token/RawAccessJwtToken.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.service.security.model.token;
+
+import io.jsonwebtoken.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.authentication.BadCredentialsException;
+import org.thingsboard.server.service.security.exception.JwtExpiredTokenException;
+
+public class RawAccessJwtToken implements JwtToken {
+    private static Logger logger = LoggerFactory.getLogger(RawAccessJwtToken.class);
+
+    private String token;
+
+    public RawAccessJwtToken(String token) {
+        this.token = token;
+    }
+
+    /**
+     * Parses and validates JWT Token signature.
+     *
+     * @throws BadCredentialsException
+     * @throws JwtExpiredTokenException
+     *
+     */
+    public Jws<Claims> parseClaims(String signingKey) {
+        try {
+            return Jwts.parser().setSigningKey(signingKey).parseClaimsJws(this.token);
+        } catch (UnsupportedJwtException | MalformedJwtException | IllegalArgumentException | SignatureException ex) {
+            logger.error("Invalid JWT Token", ex);
+            throw new BadCredentialsException("Invalid JWT token: ", ex);
+        } catch (ExpiredJwtException expiredEx) {
+            logger.info("JWT Token is expired", expiredEx);
+            throw new JwtExpiredTokenException(this, "JWT Token expired", expiredEx);
+        }
+    }
+
+    @Override
+    public String getToken() {
+        return token;
+    }
+}

diff --git a/dao/pom.xml b/dao/pom.xml
new file mode 100644
index 0000000..f9f0d56
--- /dev/null
+++ b/dao/pom.xml
@@ -0,0 +1,176 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.thingsboard</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <artifactId>server</artifactId>
+    </parent>
+    <groupId>org.thingsboard.server</groupId>
+    <artifactId>dao</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Thingsboard Server DAO Layer</name>
+    <url>http://thingsboard.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <main.dir>${basedir}/..</main.dir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.thingsboard.server.common</groupId>
+            <artifactId>data</artifactId>
+        </dependency>    
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
+		<dependency>
+			<groupId>org.apache.commons</groupId>
+			<artifactId>commons-lang3</artifactId>
+		</dependency>        
+		<dependency>
+			<groupId>commons-validator</groupId>
+			<artifactId>commons-validator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>com.github.fge</groupId>
+            <artifactId>json-schema-validator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>       
+		<dependency>
+			<groupId>com.datastax.cassandra</groupId>
+			<artifactId>cassandra-driver-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.datastax.cassandra</groupId>
+			<artifactId>cassandra-driver-mapping</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.datastax.cassandra</groupId>
+			<artifactId>cassandra-driver-extras</artifactId>
+		</dependency>
+        <dependency>
+            <groupId>io.takari.junit</groupId>
+            <artifactId>takari-cpsuite</artifactId>
+            <scope>test</scope>
+        </dependency>        
+		<dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.cassandraunit</groupId>
+            <artifactId>cassandra-unit</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-log4j12</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-x-discovery</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.hazelcast</groupId>
+            <artifactId>hazelcast-zookeeper</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.hazelcast</groupId>
+            <artifactId>hazelcast</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.hazelcast</groupId>
+            <artifactId>hazelcast-spring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${surfire.version}</version>
+                <configuration>
+                    <includes>
+                        <include>**/*TestSuite.java</include>
+                    </includes>
+                </configuration>
+            </plugin>
+		    <plugin>
+		       <groupId>org.apache.maven.plugins</groupId>
+		       <artifactId>maven-jar-plugin</artifactId>
+                <version>${jar-plugin.version}</version>
+		       <executions>
+		         <execution>
+		           <goals>
+		             <goal>test-jar</goal>
+		           </goals>
+		         </execution>
+		       </executions>
+		    </plugin>
+        </plugins>
+    </build>
+</project>

diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractDao.java b/dao/src/main/java/org/thingsboard/server/dao/AbstractDao.java
new file mode 100644
index 0000000..b927f14
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/AbstractDao.java
@@ -0,0 +1,93 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import com.datastax.driver.core.*;
+import com.datastax.driver.core.exceptions.CodecNotFoundException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.server.dao.cassandra.CassandraCluster;
+import org.thingsboard.server.dao.model.type.*;
+
+@Slf4j
+public abstract class AbstractDao {
+
+    @Autowired
+    protected CassandraCluster cluster;
+
+    private Session session;
+
+    private ConsistencyLevel defaultReadLevel;
+    private ConsistencyLevel defaultWriteLevel;
+
+    protected Session getSession() {
+        if (session == null) {
+            session = cluster.getSession();
+            defaultReadLevel = cluster.getDefaultReadConsistencyLevel();
+            defaultWriteLevel = cluster.getDefaultWriteConsistencyLevel();
+            CodecRegistry registry = session.getCluster().getConfiguration().getCodecRegistry();
+            registerCodecIfNotFound(registry, new JsonCodec());
+            registerCodecIfNotFound(registry, new DeviceCredentialsTypeCodec());
+            registerCodecIfNotFound(registry, new AuthorityCodec());
+            registerCodecIfNotFound(registry, new ComponentLifecycleStateCodec());
+            registerCodecIfNotFound(registry, new ComponentTypeCodec());
+            registerCodecIfNotFound(registry, new ComponentScopeCodec());
+            registerCodecIfNotFound(registry, new EntityTypeCodec());
+        }
+        return session;
+    }
+
+    private void registerCodecIfNotFound(CodecRegistry registry, TypeCodec<?> codec) {
+        try {
+            registry.codecFor(codec.getCqlType(), codec.getJavaType());
+        } catch (CodecNotFoundException e) {
+            registry.register(codec);
+        }
+    }
+
+    protected ResultSet executeRead(Statement statement) {
+        return execute(statement, defaultReadLevel);
+    }
+
+    protected ResultSet executeWrite(Statement statement) {
+        return execute(statement, defaultWriteLevel);
+    }
+
+
+    protected ResultSetFuture executeAsyncRead(Statement statement) {
+        return executeAsync(statement, defaultReadLevel);
+    }
+
+    protected ResultSetFuture executeAsyncWrite(Statement statement) {
+        return executeAsync(statement, defaultWriteLevel);
+    }
+
+    private ResultSet execute(Statement statement, ConsistencyLevel level) {
+        log.debug("Execute cassandra statement {}", statement);
+        if (statement.getConsistencyLevel() == null) {
+            statement.setConsistencyLevel(level);
+        }
+        return getSession().execute(statement);
+    }
+
+    private ResultSetFuture executeAsync(Statement statement, ConsistencyLevel level) {
+        log.debug("Execute cassandra async statement {}", statement);
+        if (statement.getConsistencyLevel() == null) {
+            statement.setConsistencyLevel(level);
+        }
+        return getSession().executeAsync(statement);
+    }
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractModelDao.java b/dao/src/main/java/org/thingsboard/server/dao/AbstractModelDao.java
new file mode 100644
index 0000000..229cd03
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/AbstractModelDao.java
@@ -0,0 +1,114 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Statement;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.datastax.driver.core.querybuilder.Select;
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.Mapper;
+import com.datastax.driver.mapping.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.dao.model.BaseEntity;
+import org.thingsboard.server.dao.model.wrapper.EntityResultSet;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.lt;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+
+@Slf4j
+public abstract class AbstractModelDao<T extends BaseEntity<?>> extends AbstractDao implements Dao<T> {
+
+    protected abstract Class<T> getColumnFamilyClass();
+
+    protected abstract String getColumnFamilyName();
+
+    protected Mapper<T> getMapper() {
+        return cluster.getMapper(getColumnFamilyClass());
+    }
+
+    protected List<T> findListByStatement(Statement statement) {
+        List<T> list = Collections.emptyList();
+        if (statement != null) {
+            statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel());
+            ResultSet resultSet = getSession().execute(statement);
+            Result<T> result = getMapper().map(resultSet);
+            if (result != null) {
+                list = result.all();
+            }
+        }
+        return list;
+    }
+
+    protected T findOneByStatement(Statement statement) {
+        T object = null;
+        if (statement != null) {
+            statement.setConsistencyLevel(cluster.getDefaultReadConsistencyLevel());
+            ResultSet resultSet = getSession().execute(statement);
+            Result<T> result = getMapper().map(resultSet);
+            if (result != null) {
+                object = result.one();
+            }
+        }
+        return object;
+    }
+
+    protected Statement getSaveQuery(T dto) {
+        return getMapper().saveQuery(dto);
+    }
+
+    protected EntityResultSet<T> saveWithResult(T entity) {
+        log.debug("Save entity {}", entity);
+        if (entity.getId() == null) {
+            entity.setId(UUIDs.timeBased());
+        } else {
+            removeById(entity.getId());
+        }
+        Statement saveStatement = getSaveQuery(entity);
+        saveStatement.setConsistencyLevel(cluster.getDefaultWriteConsistencyLevel());
+        ResultSet resultSet = executeWrite(saveStatement);
+        return new EntityResultSet<>(resultSet, entity);
+    }
+
+    public T save(T entity) {
+        return saveWithResult(entity).getEntity();
+    }
+
+    public T findById(UUID key) {
+        log.debug("Get entity by key {}", key);
+        Select.Where query = select().from(getColumnFamilyName()).where(eq(ModelConstants.ID_PROPERTY, key));
+        log.trace("Execute query {}", query);
+        return findOneByStatement(query);
+    }
+
+    public ResultSet removeById(UUID key) {
+        Statement delete = QueryBuilder.delete().all().from(getColumnFamilyName()).where(eq(ModelConstants.ID_PROPERTY, key));
+        log.debug("Remove request: {}", delete.toString());
+        return getSession().execute(delete);
+    }
+
+
+    public List<T> find() {
+        log.debug("Get all entities from column family {}", getColumnFamilyName());
+        return findListByStatement(QueryBuilder.select().all().from(getColumnFamilyName()).setConsistencyLevel(cluster.getDefaultReadConsistencyLevel()));
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTextDao.java b/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTextDao.java
new file mode 100644
index 0000000..d2a93e3
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTextDao.java
@@ -0,0 +1,78 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import com.datastax.driver.core.querybuilder.Clause;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.datastax.driver.core.querybuilder.Select;
+import com.datastax.driver.core.querybuilder.Select.Where;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.model.SearchTextEntity;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.util.List;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.gt;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.gte;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.lt;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+
+public abstract class AbstractSearchTextDao<T extends SearchTextEntity<?>> extends AbstractModelDao<T> {
+
+    public T save(T entity) {
+        entity.setSearchText(entity.getSearchTextSource().toLowerCase());
+        return super.save(entity);
+    }
+    
+    protected List<T> findPageWithTextSearch(String searchView, List<Clause> clauses, TextPageLink pageLink) {
+        Select select = select().from(searchView);
+        Where query = select.where();
+        for (Clause clause : clauses) {
+            query.and(clause);
+        }       
+        query.limit(pageLink.getLimit());
+        if (!StringUtils.isEmpty(pageLink.getTextOffset())) {
+            query.and(eq(ModelConstants.SEARCH_TEXT_PROPERTY, pageLink.getTextOffset()));
+            query.and(QueryBuilder.lt(ModelConstants.ID_PROPERTY, pageLink.getIdOffset()));
+            List<T> result = findListByStatement(query);
+            if (result.size() < pageLink.getLimit()) {
+                select = select().from(searchView);
+                query = select.where();
+                for (Clause clause : clauses) {
+                    query.and(clause);
+                }      
+                query.and(QueryBuilder.gt(ModelConstants.SEARCH_TEXT_PROPERTY, pageLink.getTextOffset()));
+                if (!StringUtils.isEmpty(pageLink.getTextSearch())) {
+                    query.and(QueryBuilder.lt(ModelConstants.SEARCH_TEXT_PROPERTY, pageLink.getTextSearchBound()));
+                }
+                int limit = pageLink.getLimit() - result.size();
+                query.limit(limit);
+                result.addAll(findListByStatement(query));
+            }
+            return result;
+        } else if (!StringUtils.isEmpty(pageLink.getTextSearch())) {
+            query.and(QueryBuilder.gte(ModelConstants.SEARCH_TEXT_PROPERTY, pageLink.getTextSearch()));
+            query.and(QueryBuilder.lt(ModelConstants.SEARCH_TEXT_PROPERTY, pageLink.getTextSearchBound()));
+            return findListByStatement(query);
+        } else {
+            return findListByStatement(query);
+        }
+    }
+
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java b/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java
new file mode 100644
index 0000000..dcdbbbd
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/AbstractSearchTimeDao.java
@@ -0,0 +1,90 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import com.datastax.driver.core.querybuilder.Clause;
+import com.datastax.driver.core.querybuilder.Ordering;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.datastax.driver.core.querybuilder.Select;
+import com.datastax.driver.core.querybuilder.Select.Where;
+import com.datastax.driver.core.utils.UUIDs;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.dao.model.BaseEntity;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.model.SearchTextEntity;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.UUID;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+
+public abstract class AbstractSearchTimeDao<T extends BaseEntity<?>> extends AbstractModelDao<T> {
+
+
+    protected List<T> findPageWithTimeSearch(String searchView, List<Clause> clauses, TimePageLink pageLink) {
+        return findPageWithTimeSearch(searchView, clauses, Collections.emptyList(), pageLink);
+    }
+
+    protected List<T> findPageWithTimeSearch(String searchView, List<Clause> clauses, Ordering ordering, TimePageLink pageLink) {
+        return findPageWithTimeSearch(searchView, clauses, Collections.singletonList(ordering), pageLink);
+    }
+
+
+    protected List<T> findPageWithTimeSearch(String searchView, List<Clause> clauses, List<Ordering> topLevelOrderings, TimePageLink pageLink) {
+        Select select = select().from(searchView);
+        Where query = select.where();
+        for (Clause clause : clauses) {
+            query.and(clause);
+        }
+        query.limit(pageLink.getLimit());
+        if (pageLink.isAscOrder()) {
+            if (pageLink.getIdOffset() != null) {
+                query.and(QueryBuilder.gt(ModelConstants.ID_PROPERTY, pageLink.getIdOffset()));
+            } else if (pageLink.getStartTime() != null) {
+                final UUID startOf = UUIDs.startOf(pageLink.getStartTime());
+                query.and(QueryBuilder.gte(ModelConstants.ID_PROPERTY, startOf));
+            }
+            if (pageLink.getEndTime() != null) {
+                final UUID endOf = UUIDs.endOf(pageLink.getEndTime());
+                query.and(QueryBuilder.lte(ModelConstants.ID_PROPERTY, endOf));
+            }
+        } else {
+            if (pageLink.getIdOffset() != null) {
+                query.and(QueryBuilder.lt(ModelConstants.ID_PROPERTY, pageLink.getIdOffset()));
+            } else if (pageLink.getEndTime() != null) {
+                final UUID endOf = UUIDs.endOf(pageLink.getEndTime());
+                query.and(QueryBuilder.lte(ModelConstants.ID_PROPERTY, endOf));
+            }
+            if (pageLink.getStartTime() != null) {
+                final UUID startOf = UUIDs.startOf(pageLink.getStartTime());
+                query.and(QueryBuilder.gte(ModelConstants.ID_PROPERTY, startOf));
+            }
+        }
+        List<Ordering> orderings = new ArrayList<>(topLevelOrderings);
+        if (pageLink.isAscOrder()) {
+            orderings.add(QueryBuilder.asc(ModelConstants.ID_PROPERTY));
+        } else {
+            orderings.add(QueryBuilder.desc(ModelConstants.ID_PROPERTY));
+        }
+        query.orderBy(orderings.toArray(new Ordering[orderings.size()]));
+        return findListByStatement(query);
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java
new file mode 100644
index 0000000..3af7748
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraCluster.java
@@ -0,0 +1,159 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.cassandra;
+
+
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.ConsistencyLevel;
+import com.datastax.driver.core.ProtocolOptions.Compression;
+import com.datastax.driver.core.Session;
+import com.datastax.driver.core.exceptions.NoHostAvailableException;
+import com.datastax.driver.mapping.Mapper;
+import com.datastax.driver.mapping.MappingManager;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.dao.exception.DatabaseException;
+
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
+import java.io.Closeable;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringTokenizer;
+
+@Component
+@Slf4j
+@Data
+public class CassandraCluster {
+
+    private static final String COMMA = ",";
+    private static final String COLON = ":";
+
+    @Value("${cassandra.cluster_name}")
+    private String clusterName;
+    @Value("${cassandra.keyspace_name}")
+    private String keyspaceName;
+    @Value("${cassandra.url}")
+    private String url;
+    @Value("${cassandra.compression}")
+    private String compression;
+    @Value("${cassandra.ssl}")
+    private Boolean ssl;
+    @Value("${cassandra.jmx}")
+    private Boolean jmx;
+    @Value("${cassandra.metrics}")
+    private Boolean metrics;
+    @Value("${cassandra.credentials}")
+    private Boolean credentials;
+    @Value("${cassandra.username}")
+    private String username;
+    @Value("${cassandra.password}")
+    private String password;
+    @Value("${cassandra.init_timeout_ms}")
+    private long initTimeout;
+    @Value("${cassandra.init_retry_interval_ms}")
+    private long initRetryInterval;
+
+    @Autowired
+    private CassandraSocketOptions socketOpts;
+
+    @Autowired
+    private CassandraQueryOptions queryOpts;
+
+    private Cluster cluster;
+    private Session session;
+    private MappingManager mappingManager;
+
+    public <T> Mapper<T> getMapper(Class<T> clazz) {
+        return mappingManager.mapper(clazz);
+    }
+
+    @PostConstruct
+    public void init() {
+        long endTime = System.currentTimeMillis() + initTimeout;
+        while (System.currentTimeMillis() < endTime) {
+            try {
+                Cluster.Builder builder = Cluster.builder()
+                        .addContactPointsWithPorts(getContactPoints(url))
+                        .withClusterName(clusterName)
+                        .withSocketOptions(socketOpts.getOpts());
+                builder.withQueryOptions(queryOpts.getOpts());
+                builder.withCompression(StringUtils.isEmpty(compression) ? Compression.NONE : Compression.valueOf(compression.toUpperCase()));
+                if (ssl) {
+                    builder.withSSL();
+                }
+                if (!jmx) {
+                    builder.withoutJMXReporting();
+                }
+                if (!metrics) {
+                    builder.withoutMetrics();
+                }
+                if (credentials) {
+                    builder.withCredentials(username, password);
+                }
+                cluster = builder.build();
+                cluster.init();
+                session = cluster.connect(keyspaceName);
+                mappingManager = new MappingManager(session);
+                break;
+            } catch (Exception e) {
+                log.warn("Failed to initialize cassandra cluster due to {}. Will retry in {} ms", e.getMessage(), initRetryInterval);
+                try {
+                    Thread.sleep(initRetryInterval);
+                } catch (InterruptedException ie) {
+                    log.warn("Failed to wait until retry", ie);
+                }
+            }
+        }
+    }
+
+    @PreDestroy
+    public void close() {
+        if (cluster != null) {
+            cluster.close();
+        }
+    }
+
+    private List<InetSocketAddress> getContactPoints(String url) {
+        List<InetSocketAddress> result;
+        if (StringUtils.isBlank(url)) {
+            result = Collections.emptyList();
+        } else {
+            result = new ArrayList<>();
+            for (String hostPort : url.split(COMMA)) {
+                String host = hostPort.split(COLON)[0];
+                Integer port = Integer.valueOf(hostPort.split(COLON)[1]);
+                result.add(new InetSocketAddress(host, port));
+            }
+        }
+        return result;
+    }
+
+    public ConsistencyLevel getDefaultReadConsistencyLevel() {
+        return queryOpts.getDefaultReadConsistencyLevel();
+    }
+
+    public ConsistencyLevel getDefaultWriteConsistencyLevel() {
+        return queryOpts.getDefaultWriteConsistencyLevel();
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java
new file mode 100644
index 0000000..291f2da
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraQueryOptions.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.cassandra;
+
+import com.datastax.driver.core.ConsistencyLevel;
+import com.datastax.driver.core.QueryOptions;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.PostConstruct;
+
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
+@Component
+@Configuration
+@Data
+public class CassandraQueryOptions {
+
+    @Value("${cassandra.query.default_fetch_size}")
+    private Integer defaultFetchSize;
+    @Value("${cassandra.query.read_consistency_level}")
+    private String readConsistencyLevel;
+    @Value("${cassandra.query.write_consistency_level}")
+    private String writeConsistencyLevel;
+
+    private QueryOptions opts;
+
+    private ConsistencyLevel defaultReadConsistencyLevel;
+    private ConsistencyLevel defaultWriteConsistencyLevel;
+
+    @PostConstruct
+    public void initOpts(){
+        opts = new QueryOptions();
+        opts.setFetchSize(defaultFetchSize);
+    }
+
+    protected ConsistencyLevel getDefaultReadConsistencyLevel() {
+        if (defaultReadConsistencyLevel == null) {
+            if (readConsistencyLevel != null) {
+                defaultReadConsistencyLevel = ConsistencyLevel.valueOf(readConsistencyLevel.toUpperCase());
+            } else {
+                defaultReadConsistencyLevel = ConsistencyLevel.ONE;
+            }
+        }
+        return defaultReadConsistencyLevel;
+    }
+
+    protected ConsistencyLevel getDefaultWriteConsistencyLevel() {
+        if (defaultWriteConsistencyLevel == null) {
+            if (writeConsistencyLevel != null) {
+                defaultWriteConsistencyLevel = ConsistencyLevel.valueOf(writeConsistencyLevel.toUpperCase());
+            } else {
+                defaultWriteConsistencyLevel = ConsistencyLevel.ONE;
+            }
+        }
+        return defaultWriteConsistencyLevel;
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java
new file mode 100644
index 0000000..b2cf918
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/cassandra/CassandraSocketOptions.java
@@ -0,0 +1,75 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.cassandra;
+
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+
+import com.datastax.driver.core.SocketOptions;
+
+import javax.annotation.PostConstruct;
+
+@Component
+@Configuration
+@Data
+public class CassandraSocketOptions {
+
+    @Value("${cassandra.socket.connect_timeout}")
+    private int connectTimeoutMillis;
+    @Value("${cassandra.socket.read_timeout}")
+    private int readTimeoutMillis;
+    @Value("${cassandra.socket.keep_alive}")
+    private Boolean keepAlive;
+    @Value("${cassandra.socket.reuse_address}")
+    private Boolean reuseAddress;
+    @Value("${cassandra.socket.so_linger}")
+    private Integer soLinger;
+    @Value("${cassandra.socket.tcp_no_delay}")
+    private Boolean tcpNoDelay;
+    @Value("${cassandra.socket.receive_buffer_size}")
+    private Integer receiveBufferSize;
+    @Value("${cassandra.socket.send_buffer_size}")
+    private Integer sendBufferSize;
+
+    private SocketOptions opts;
+
+    @PostConstruct
+    public void initOpts() {
+        opts = new SocketOptions();
+        opts.setConnectTimeoutMillis(connectTimeoutMillis);
+        opts.setReadTimeoutMillis(readTimeoutMillis);
+        if (keepAlive != null) {
+            opts.setKeepAlive(keepAlive);
+        }
+        if (reuseAddress != null) {
+            opts.setReuseAddress(reuseAddress);
+        }
+        if (soLinger != null) {
+            opts.setSoLinger(soLinger);
+        }
+        if (tcpNoDelay != null) {
+            opts.setTcpNoDelay(tcpNoDelay);
+        }
+        if (receiveBufferSize != null) {
+            opts.setReceiveBufferSize(receiveBufferSize);
+        }
+        if (sendBufferSize != null) {
+            opts.setSendBufferSize(sendBufferSize);
+        }
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java
new file mode 100644
index 0000000..8e07bbf
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorDao.java
@@ -0,0 +1,169 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.component;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.Statement;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.datastax.driver.core.querybuilder.Select;
+import com.datastax.driver.core.utils.UUIDs;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.ComponentDescriptorId;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentScope;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.model.ComponentDescriptorEntity;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+
+/**
+ * @author Andrew Shvayka
+ */
+@Component
+@Slf4j
+public class BaseComponentDescriptorDao extends AbstractSearchTextDao<ComponentDescriptorEntity> implements ComponentDescriptorDao {
+
+    @Override
+    protected Class<ComponentDescriptorEntity> getColumnFamilyClass() {
+        return ComponentDescriptorEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public Optional<ComponentDescriptorEntity> save(ComponentDescriptor component) {
+        ComponentDescriptorEntity entity = new ComponentDescriptorEntity(component);
+        log.debug("Save component entity [{}]", entity);
+        Optional<ComponentDescriptorEntity> result = saveIfNotExist(entity);
+        if (log.isTraceEnabled()) {
+            log.trace("Saved result: [{}] for component entity [{}]", result.isPresent(), result.orElse(null));
+        } else {
+            log.debug("Saved result: [{}]", result.isPresent());
+        }
+        return result;
+    }
+
+    @Override
+    public ComponentDescriptorEntity findById(ComponentDescriptorId componentId) {
+        log.debug("Search component entity by id [{}]", componentId);
+        ComponentDescriptorEntity entity = super.findById(componentId.getId());
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}] for component entity [{}]", entity != null, entity);
+        } else {
+            log.debug("Search result: [{}]", entity != null);
+        }
+        return entity;
+    }
+
+    @Override
+    public ComponentDescriptorEntity findByClazz(String clazz) {
+        log.debug("Search component entity by clazz [{}]", clazz);
+        Select.Where query = select().from(getColumnFamilyName()).where(eq(ModelConstants.COMPONENT_DESCRIPTOR_CLASS_PROPERTY, clazz));
+        log.trace("Execute query [{}]", query);
+        ComponentDescriptorEntity entity = findOneByStatement(query);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}] for component entity [{}]", entity != null, entity);
+        } else {
+            log.debug("Search result: [{}]", entity != null);
+        }
+        return entity;
+    }
+
+    @Override
+    public List<ComponentDescriptorEntity> findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) {
+        log.debug("Try to find component by type [{}] and pageLink [{}]", type, pageLink);
+        List<ComponentDescriptorEntity> entities = findPageWithTextSearch(ModelConstants.COMPONENT_DESCRIPTOR_BY_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, type.name())), pageLink);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}]", Arrays.toString(entities.toArray()));
+        } else {
+            log.debug("Search result: [{}]", entities.size());
+        }
+        return entities;
+    }
+
+    @Override
+    public List<ComponentDescriptorEntity> findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) {
+        log.debug("Try to find component by scope [{}] and type [{}] and pageLink [{}]", scope, type, pageLink);
+        List<ComponentDescriptorEntity> entities = findPageWithTextSearch(ModelConstants.COMPONENT_DESCRIPTOR_BY_SCOPE_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, type.name()),
+                        eq(ModelConstants.COMPONENT_DESCRIPTOR_SCOPE_PROPERTY, scope.name())), pageLink);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}]", Arrays.toString(entities.toArray()));
+        } else {
+            log.debug("Search result: [{}]", entities.size());
+        }
+        return entities;
+    }
+
+    public ResultSet removeById(UUID key) {
+        Statement delete = QueryBuilder.delete().all().from(ModelConstants.COMPONENT_DESCRIPTOR_BY_ID).where(eq(ModelConstants.ID_PROPERTY, key));
+        log.debug("Remove request: {}", delete.toString());
+        return getSession().execute(delete);
+    }
+
+    @Override
+    public void deleteById(ComponentDescriptorId id) {
+        log.debug("Delete plugin meta-data entity by id [{}]", id);
+        ResultSet resultSet = removeById(id.getId());
+        log.debug("Delete result: [{}]", resultSet.wasApplied());
+    }
+
+    @Override
+    public void deleteByClazz(String clazz) {
+        log.debug("Delete plugin meta-data entity by id [{}]", clazz);
+        Statement delete = QueryBuilder.delete().all().from(getColumnFamilyName()).where(eq(ModelConstants.COMPONENT_DESCRIPTOR_CLASS_PROPERTY, clazz));
+        log.debug("Remove request: {}", delete.toString());
+        ResultSet resultSet = getSession().execute(delete);
+        log.debug("Delete result: [{}]", resultSet.wasApplied());
+    }
+
+    private Optional<ComponentDescriptorEntity> saveIfNotExist(ComponentDescriptorEntity entity) {
+        if (entity.getId() == null) {
+            entity.setId(UUIDs.timeBased());
+        }
+
+        ResultSet rs = executeRead(QueryBuilder.insertInto(getColumnFamilyName())
+                .value(ModelConstants.ID_PROPERTY, entity.getId())
+                .value(ModelConstants.COMPONENT_DESCRIPTOR_NAME_PROPERTY, entity.getName())
+                .value(ModelConstants.COMPONENT_DESCRIPTOR_CLASS_PROPERTY, entity.getClazz())
+                .value(ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY, entity.getType())
+                .value(ModelConstants.COMPONENT_DESCRIPTOR_SCOPE_PROPERTY, entity.getScope())
+                .value(ModelConstants.COMPONENT_DESCRIPTOR_CONFIGURATION_DESCRIPTOR_PROPERTY, entity.getConfigurationDescriptor())
+                .value(ModelConstants.COMPONENT_DESCRIPTOR_ACTIONS_PROPERTY, entity.getActions())
+                .value(ModelConstants.SEARCH_TEXT_PROPERTY, entity.getSearchText())
+                .ifNotExists()
+        );
+        if (rs.wasApplied()) {
+            return Optional.of(entity);
+        } else {
+            return Optional.empty();
+        }
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
new file mode 100644
index 0000000..23a53cf
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/component/BaseComponentDescriptorService.java
@@ -0,0 +1,133 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.component;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.github.fge.jsonschema.core.exceptions.ProcessingException;
+import com.github.fge.jsonschema.core.report.ProcessingReport;
+import com.github.fge.jsonschema.main.JsonSchemaFactory;
+import com.github.fge.jsonschema.main.JsonValidator;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.id.ComponentDescriptorId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentScope;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.ComponentDescriptorEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.Validator;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+
+/**
+ * @author Andrew Shvayka
+ */
+@Service
+@Slf4j
+public class BaseComponentDescriptorService implements ComponentDescriptorService {
+
+    @Autowired
+    private ComponentDescriptorDao componentDescriptorDao;
+
+    @Override
+    public ComponentDescriptor saveComponent(ComponentDescriptor component) {
+        componentValidator.validate(component);
+        Optional<ComponentDescriptorEntity> result = componentDescriptorDao.save(component);
+        if (result.isPresent()) {
+            return getData(result.get());
+        } else {
+            return getData(componentDescriptorDao.findByClazz(component.getClazz()));
+        }
+    }
+
+    @Override
+    public ComponentDescriptor findById(ComponentDescriptorId componentId) {
+        Validator.validateId(componentId, "Incorrect component id for search request.");
+        return getData(componentDescriptorDao.findById(componentId));
+    }
+
+    @Override
+    public ComponentDescriptor findByClazz(String clazz) {
+        Validator.validateString(clazz, "Incorrect clazz for search request.");
+        return getData(componentDescriptorDao.findByClazz(clazz));
+    }
+
+    @Override
+    public TextPageData<ComponentDescriptor> findByTypeAndPageLink(ComponentType type, TextPageLink pageLink) {
+        Validator.validatePageLink(pageLink, "Incorrect PageLink object for search plugin components request.");
+        List<ComponentDescriptorEntity> pluginEntities = componentDescriptorDao.findByTypeAndPageLink(type, pageLink);
+        List<ComponentDescriptor> components = convertDataList(pluginEntities);
+        return new TextPageData<>(components, pageLink);
+    }
+
+    @Override
+    public TextPageData<ComponentDescriptor> findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink) {
+        Validator.validatePageLink(pageLink, "Incorrect PageLink object for search plugin components request.");
+        List<ComponentDescriptorEntity> pluginEntities = componentDescriptorDao.findByScopeAndTypeAndPageLink(scope, type, pageLink);
+        List<ComponentDescriptor> components = convertDataList(pluginEntities);
+        return new TextPageData<>(components, pageLink);
+    }
+
+    @Override
+    public void deleteByClazz(String clazz) {
+        Validator.validateString(clazz, "Incorrect clazz for delete request.");
+        componentDescriptorDao.deleteByClazz(clazz);
+    }
+
+    @Override
+    public boolean validate(ComponentDescriptor component, JsonNode configuration) {
+        JsonValidator validator = JsonSchemaFactory.byDefault().getValidator();
+        try {
+            if (!component.getConfigurationDescriptor().has("schema")) {
+                throw new DataValidationException("Configuration descriptor doesn't contain schema property!");
+            }
+            JsonNode configurationSchema = component.getConfigurationDescriptor().get("schema");
+            ProcessingReport report = validator.validate(configurationSchema, configuration);
+            return report.isSuccess();
+        } catch (ProcessingException e) {
+            throw new IncorrectParameterException(e.getMessage(), e);
+        }
+    }
+
+    private DataValidator<ComponentDescriptor> componentValidator =
+            new DataValidator<ComponentDescriptor>() {
+                @Override
+                protected void validateDataImpl(ComponentDescriptor plugin) {
+                    if (plugin.getType() == null) {
+                        throw new DataValidationException("Component type should be specified!.");
+                    }
+                    if (plugin.getScope() == null) {
+                        throw new DataValidationException("Component scope should be specified!.");
+                    }
+                    if (StringUtils.isEmpty(plugin.getName())) {
+                        throw new DataValidationException("Component name should be specified!.");
+                    }
+                    if (StringUtils.isEmpty(plugin.getClazz())) {
+                        throw new DataValidationException("Component clazz should be specified!.");
+                    }
+                }
+            };
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorDao.java b/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorDao.java
new file mode 100644
index 0000000..c78103c
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorDao.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.component;
+
+import org.thingsboard.server.common.data.id.ComponentDescriptorId;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentScope;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.ComponentDescriptorEntity;
+
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * @author Andrew Shvayka
+ */
+public interface ComponentDescriptorDao extends Dao<ComponentDescriptorEntity> {
+
+    Optional<ComponentDescriptorEntity> save(ComponentDescriptor component);
+
+    ComponentDescriptorEntity findById(ComponentDescriptorId componentId);
+
+    ComponentDescriptorEntity findByClazz(String clazz);
+
+    List<ComponentDescriptorEntity> findByTypeAndPageLink(ComponentType type, TextPageLink pageLink);
+
+    List<ComponentDescriptorEntity> findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink);
+
+    void deleteById(ComponentDescriptorId componentId);
+
+    void deleteByClazz(String clazz);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorService.java b/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorService.java
new file mode 100644
index 0000000..9ec81e7
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/component/ComponentDescriptorService.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.component;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.id.ComponentDescriptorId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentScope;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+
+/**
+ * @author Andrew Shvayka
+ */
+public interface ComponentDescriptorService {
+
+    ComponentDescriptor saveComponent(ComponentDescriptor component);
+
+    ComponentDescriptor findById(ComponentDescriptorId componentId);
+
+    ComponentDescriptor findByClazz(String clazz);
+
+    TextPageData<ComponentDescriptor> findByTypeAndPageLink(ComponentType type, TextPageLink pageLink);
+
+    TextPageData<ComponentDescriptor> findByScopeAndTypeAndPageLink(ComponentScope scope, ComponentType type, TextPageLink pageLink);
+
+    boolean validate(ComponentDescriptor component, JsonNode configuration);
+
+    void deleteByClazz(String clazz);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java
new file mode 100644
index 0000000..de950a2
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDao.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.customer;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.CustomerEntity;
+
+/**
+ * The Interface CustomerDao.
+ */
+public interface CustomerDao extends Dao<CustomerEntity> {
+
+    /**
+     * Save or update customer object
+     *
+     * @param customer the customer object
+     * @return saved customer object
+     */
+    CustomerEntity save(Customer customer);
+    
+    /**
+     * Find customers by tenant id and page link.
+     *
+     * @param tenantId the tenant id
+     * @param pageLink the page link
+     * @return the list of customer objects
+     */
+    List<CustomerEntity> findCustomersByTenantId(UUID tenantId, TextPageLink pageLink);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDaoImpl.java
new file mode 100644
index 0000000..719be97
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerDaoImpl.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.customer;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.CustomerEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.thingsboard.server.dao.model.ModelConstants;
+@Component
+@Slf4j
+public class CustomerDaoImpl extends AbstractSearchTextDao<CustomerEntity> implements CustomerDao {
+
+    @Override
+    protected Class<CustomerEntity> getColumnFamilyClass() {
+        return CustomerEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME;
+    }
+    
+    @Override
+    public CustomerEntity save(Customer customer) {
+        log.debug("Save customer [{}] ", customer);
+        return save(new CustomerEntity(customer));
+    }
+
+    @Override
+    public List<CustomerEntity> findCustomersByTenantId(UUID tenantId, TextPageLink pageLink) {
+        log.debug("Try to find customers by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<CustomerEntity> customerEntities = findPageWithTextSearch(ModelConstants.CUSTOMER_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(ModelConstants.CUSTOMER_TENANT_ID_PROPERTY, tenantId)),
+                pageLink); 
+        log.trace("Found customers [{}] by tenantId [{}] and pageLink [{}]", customerEntities, tenantId, pageLink);
+        return customerEntities;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java
new file mode 100644
index 0000000..bf5ff6e
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java
@@ -0,0 +1,36 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.customer;
+
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+
+public interface CustomerService {
+
+    public Customer findCustomerById(CustomerId customerId);
+    
+    public Customer saveCustomer(Customer customer);
+    
+    public void deleteCustomer(CustomerId customerId);
+    
+    public TextPageData<Customer> findCustomersByTenantId(TenantId tenantId, TextPageLink pageLink);
+    
+    public void deleteCustomersByTenantId(TenantId tenantId);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
new file mode 100644
index 0000000..ffb985c
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java
@@ -0,0 +1,145 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.customer;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+
+import java.util.List;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.dashboard.DashboardService;
+import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.CustomerEntity;
+import org.thingsboard.server.dao.model.TenantEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.tenant.TenantDao;
+import org.thingsboard.server.dao.user.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.service.Validator;
+@Service
+@Slf4j
+public class CustomerServiceImpl implements CustomerService {
+
+    @Autowired
+    private CustomerDao customerDao;
+    
+    @Autowired
+    private UserService userService;
+    
+    @Autowired
+    private TenantDao tenantDao;
+    
+    @Autowired
+    private DeviceService deviceService;
+    
+    @Autowired
+    private DashboardService dashboardService;
+    
+    @Override
+    public Customer findCustomerById(CustomerId customerId) {
+        log.trace("Executing findCustomerById [{}]", customerId);
+        Validator.validateId(customerId, "Incorrect customerId " + customerId);
+        CustomerEntity customerEntity = customerDao.findById(customerId.getId());
+        return getData(customerEntity);
+    }
+
+    @Override
+    public Customer saveCustomer(Customer customer) {
+        log.trace("Executing saveCustomer [{}]", customer);
+        customerValidator.validate(customer);
+        CustomerEntity customerEntity = customerDao.save(customer);
+        return getData(customerEntity);
+    }
+
+    @Override
+    public void deleteCustomer(CustomerId customerId) {
+        log.trace("Executing deleteCustomer [{}]", customerId);
+        Validator.validateId(customerId, "Incorrect tenantId " + customerId);
+        Customer customer = findCustomerById(customerId);
+        if (customer == null) {
+            throw new IncorrectParameterException("Unable to delete non-existent customer.");
+        }
+        dashboardService.unassignCustomerDashboards(customer.getTenantId(), customerId);
+        deviceService.unassignCustomerDevices(customer.getTenantId(), customerId);
+        userService.deleteCustomerUsers(customer.getTenantId(), customerId);               
+        customerDao.removeById(customerId.getId());
+    }
+
+    @Override
+    public TextPageData<Customer> findCustomersByTenantId(TenantId tenantId, TextPageLink pageLink) {
+        log.trace("Executing findCustomersByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<CustomerEntity> customerEntities = customerDao.findCustomersByTenantId(tenantId.getId(), pageLink);
+        List<Customer> customers = convertDataList(customerEntities);
+        return new TextPageData<Customer>(customers, pageLink);
+    }
+
+    @Override
+    public void deleteCustomersByTenantId(TenantId tenantId) {
+        log.trace("Executing deleteCustomersByTenantId, tenantId [{}]", tenantId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        customersByTenantRemover.removeEntitites(tenantId);
+    }
+    
+    private DataValidator<Customer> customerValidator =
+            new DataValidator<Customer>() {
+                @Override
+                protected void validateDataImpl(Customer customer) {
+                    if (StringUtils.isEmpty(customer.getTitle())) {
+                        throw new DataValidationException("Customer title should be specified!");
+                    }
+                    if (!StringUtils.isEmpty(customer.getEmail())) {
+                        validateEmail(customer.getEmail());
+                    }
+                    if (customer.getTenantId() == null) {
+                        throw new DataValidationException("Customer should be assigned to tenant!");
+                    } else {
+                        TenantEntity tenant = tenantDao.findById(customer.getTenantId().getId());
+                        if (tenant == null) {
+                            throw new DataValidationException("Customer is referencing to non-existent tenant!");
+                        }
+                    }
+                }
+    };
+
+    private PaginatedRemover<TenantId, CustomerEntity> customersByTenantRemover =
+            new PaginatedRemover<TenantId, CustomerEntity>() {
+        
+        @Override
+        protected List<CustomerEntity> findEntities(TenantId id, TextPageLink pageLink) {
+            return customerDao.findCustomersByTenantId(id.getId(), pageLink);
+        }
+
+        @Override
+        protected void removeEntity(CustomerEntity entity) {
+            deleteCustomer(new CustomerId(entity.getId()));
+        }
+    };
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/Dao.java b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
new file mode 100644
index 0000000..c34472b
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/Dao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import com.datastax.driver.core.ResultSet;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface Dao<T> {
+
+    List<T> find();
+
+    T findById(UUID id);
+
+    T save(T t);
+
+    ResultSet removeById(UUID id);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
new file mode 100644
index 0000000..da1a42f
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/DaoUtil.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.id.UUIDBased;
+import org.thingsboard.server.dao.model.ToData;
+
+public abstract class DaoUtil {
+
+    private DaoUtil() {
+    }
+
+    public static <T> List<T> convertDataList(Collection<? extends ToData<T>> toDataList) {
+        List<T> list = Collections.emptyList();
+        if (toDataList != null && !toDataList.isEmpty()) {
+            list = new ArrayList<>();
+            for (ToData<T> object : toDataList) {
+                list.add(object.toData());
+            }
+        }
+        return list;
+    }
+
+    public static <T> T getData(ToData<T> data) {
+        T object = null;
+        if (data != null) {
+            object = data.toData();
+        }
+        return object;
+    }
+
+    public static UUID getId(UUIDBased idBased) {
+        UUID id = null;
+        if (idBased != null) {
+            id = idBased.getId();
+        }
+        return id;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDao.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDao.java
new file mode 100644
index 0000000..056e901
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDao.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.dashboard;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.DashboardEntity;
+
+/**
+ * The Interface DashboardDao.
+ *
+ * @param <T> the generic type
+ */
+public interface DashboardDao extends Dao<DashboardEntity> {
+
+    /**
+     * Save or update dashboard object
+     *
+     * @param dashboard the dashboard object
+     * @return saved dashboard object
+     */
+    DashboardEntity save(Dashboard dashboard);
+
+    /**
+     * Find dashboards by tenantId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param pageLink the page link
+     * @return the list of dashboard objects
+     */
+    List<DashboardEntity> findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink);
+    
+    /**
+     * Find dashboards by tenantId, customerId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param customerId the customerId
+     * @param pageLink the page link
+     * @return the list of dashboard objects
+     */
+    List<DashboardEntity> findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDaoImpl.java
new file mode 100644
index 0000000..54a32ea
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardDaoImpl.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.dashboard;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_CUSTOMER_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.DASHBOARD_TENANT_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.DashboardEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Component
+@Slf4j
+public class DashboardDaoImpl extends AbstractSearchTextDao<DashboardEntity> implements DashboardDao {
+
+    @Override
+    protected Class<DashboardEntity> getColumnFamilyClass() {
+        return DashboardEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return DASHBOARD_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public DashboardEntity save(Dashboard dashboard) {
+        log.debug("Save dashboard [{}] ", dashboard);
+        return save(new DashboardEntity(dashboard));
+    }
+
+    @Override
+    public List<DashboardEntity> findDashboardsByTenantId(UUID tenantId, TextPageLink pageLink) {
+        log.debug("Try to find dashboards by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<DashboardEntity> dashboardEntities = findPageWithTextSearch(DASHBOARD_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, 
+                Arrays.asList(eq(DASHBOARD_TENANT_ID_PROPERTY, tenantId),
+                              eq(DASHBOARD_CUSTOMER_ID_PROPERTY, NULL_UUID)), 
+                pageLink); 
+        
+        log.trace("Found dashboards [{}] by tenantId [{}] and pageLink [{}]", dashboardEntities, tenantId, pageLink);
+        return dashboardEntities;
+    }
+
+    @Override
+    public List<DashboardEntity> findDashboardsByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) {
+        log.debug("Try to find dashboards by tenantId [{}], customerId[{}] and pageLink [{}]", tenantId, customerId, pageLink);
+        List<DashboardEntity> dashboardEntities = findPageWithTextSearch(DASHBOARD_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, 
+                Arrays.asList(eq(DASHBOARD_CUSTOMER_ID_PROPERTY, customerId),
+                              eq(DASHBOARD_TENANT_ID_PROPERTY, tenantId)), 
+                pageLink); 
+        
+        log.trace("Found dashboards [{}] by tenantId [{}], customerId [{}] and pageLink [{}]", dashboardEntities, tenantId, customerId, pageLink);
+        return dashboardEntities;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java
new file mode 100644
index 0000000..773f39f
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.dashboard;
+
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+
+public interface DashboardService {
+    
+    public Dashboard findDashboardById(DashboardId dashboardId);
+    
+    public Dashboard saveDashboard(Dashboard dashboard);
+    
+    public Dashboard assignDashboardToCustomer(DashboardId dashboardId, CustomerId customerId);
+
+    public Dashboard unassignDashboardFromCustomer(DashboardId dashboardId);
+
+    public void deleteDashboard(DashboardId dashboardId);
+    
+    public TextPageData<Dashboard> findDashboardsByTenantId(TenantId tenantId, TextPageLink pageLink);
+
+    public void deleteDashboardsByTenantId(TenantId tenantId);
+    
+    public TextPageData<Dashboard> findDashboardsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, TextPageLink pageLink);
+
+    public void unassignCustomerDashboards(TenantId tenantId, CustomerId customerId);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
new file mode 100644
index 0000000..33d61dc
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java
@@ -0,0 +1,195 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.dashboard;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+
+import java.util.List;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.customer.CustomerDao;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.CustomerEntity;
+import org.thingsboard.server.dao.model.DashboardEntity;
+import org.thingsboard.server.dao.model.TenantEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.tenant.TenantDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.service.Validator;
+
+@Service
+@Slf4j
+public class DashboardServiceImpl implements DashboardService {
+
+    @Autowired
+    private DashboardDao dashboardDao;
+    
+    @Autowired
+    private TenantDao tenantDao;
+    
+    @Autowired
+    private CustomerDao customerDao;
+    
+    @Override
+    public Dashboard findDashboardById(DashboardId dashboardId) {
+        log.trace("Executing findDashboardById [{}]", dashboardId);
+        Validator.validateId(dashboardId, "Incorrect dashboardId " + dashboardId);
+        DashboardEntity dashboardEntity = dashboardDao.findById(dashboardId.getId());
+        return getData(dashboardEntity);
+    }
+
+    @Override
+    public Dashboard saveDashboard(Dashboard dashboard) {
+        log.trace("Executing saveDashboard [{}]", dashboard);
+        dashboardValidator.validate(dashboard);
+        DashboardEntity dashboardEntity = dashboardDao.save(dashboard);
+        return getData(dashboardEntity);
+    }
+    
+    @Override
+    public Dashboard assignDashboardToCustomer(DashboardId dashboardId, CustomerId customerId) {
+        Dashboard dashboard = findDashboardById(dashboardId);
+        dashboard.setCustomerId(customerId);
+        return saveDashboard(dashboard);
+    }
+
+    @Override
+    public Dashboard unassignDashboardFromCustomer(DashboardId dashboardId) {
+        Dashboard dashboard = findDashboardById(dashboardId);
+        dashboard.setCustomerId(null);
+        return saveDashboard(dashboard);
+    }
+
+    @Override
+    public void deleteDashboard(DashboardId dashboardId) {
+        log.trace("Executing deleteDashboard [{}]", dashboardId);
+        Validator.validateId(dashboardId, "Incorrect dashboardId " + dashboardId);
+        dashboardDao.removeById(dashboardId.getId());
+    }
+
+    @Override
+    public TextPageData<Dashboard> findDashboardsByTenantId(TenantId tenantId, TextPageLink pageLink) {
+        log.trace("Executing findDashboardsByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<DashboardEntity> dashboardEntities = dashboardDao.findDashboardsByTenantId(tenantId.getId(), pageLink);
+        List<Dashboard> dashboards = convertDataList(dashboardEntities);
+        return new TextPageData<Dashboard>(dashboards, pageLink);
+    }
+
+    @Override
+    public void deleteDashboardsByTenantId(TenantId tenantId) {
+        log.trace("Executing deleteDashboardsByTenantId, tenantId [{}]", tenantId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        tenantDashboardsRemover.removeEntitites(tenantId);
+    }
+
+    @Override
+    public TextPageData<Dashboard> findDashboardsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, TextPageLink pageLink) {
+        log.trace("Executing findDashboardsByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateId(customerId, "Incorrect customerId " + customerId);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<DashboardEntity> dashboardEntities = dashboardDao.findDashboardsByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
+        List<Dashboard> dashboards = convertDataList(dashboardEntities);
+        return new TextPageData<Dashboard>(dashboards, pageLink);
+    }
+
+    @Override
+    public void unassignCustomerDashboards(TenantId tenantId, CustomerId customerId) {
+        log.trace("Executing unassignCustomerDashboards, tenantId [{}], customerId [{}]", tenantId, customerId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateId(customerId, "Incorrect customerId " + customerId);
+        new CustomerDashboardsUnassigner(tenantId).removeEntitites(customerId);
+    }
+    
+    private DataValidator<Dashboard> dashboardValidator =
+            new DataValidator<Dashboard>() {
+                @Override
+                protected void validateDataImpl(Dashboard dashboard) {
+                    if (StringUtils.isEmpty(dashboard.getTitle())) {
+                        throw new DataValidationException("Dashboard title should be specified!");
+                    }
+                    if (dashboard.getTenantId() == null) {
+                        throw new DataValidationException("Dashboard should be assigned to tenant!");
+                    } else {
+                        TenantEntity tenant = tenantDao.findById(dashboard.getTenantId().getId());
+                        if (tenant == null) {
+                            throw new DataValidationException("Dashboard is referencing to non-existent tenant!");
+                        }
+                    }
+                    if (dashboard.getCustomerId() == null) {
+                        dashboard.setCustomerId(new CustomerId(ModelConstants.NULL_UUID));
+                    } else if (!dashboard.getCustomerId().getId().equals(ModelConstants.NULL_UUID)) {
+                        CustomerEntity customer = customerDao.findById(dashboard.getCustomerId().getId());
+                        if (customer == null) {
+                            throw new DataValidationException("Can't assign dashboard to non-existent customer!");
+                        }
+                        if (!customer.getTenantId().equals(dashboard.getTenantId().getId())) {
+                            throw new DataValidationException("Can't assign dashboard to customer from different tenant!");
+                        }
+                    }
+                }
+    };
+    
+    private PaginatedRemover<TenantId, DashboardEntity> tenantDashboardsRemover =
+            new PaginatedRemover<TenantId, DashboardEntity>() {
+        
+        @Override
+        protected List<DashboardEntity> findEntities(TenantId id, TextPageLink pageLink) {
+            return dashboardDao.findDashboardsByTenantId(id.getId(), pageLink);
+        }
+
+        @Override
+        protected void removeEntity(DashboardEntity entity) {
+            deleteDashboard(new DashboardId(entity.getId()));
+        }
+    };
+    
+    class CustomerDashboardsUnassigner extends PaginatedRemover<CustomerId, DashboardEntity> {
+        
+        private TenantId tenantId;
+        
+        CustomerDashboardsUnassigner(TenantId tenantId) {
+            this.tenantId = tenantId;
+        }
+
+        @Override
+        protected List<DashboardEntity> findEntities(CustomerId id, TextPageLink pageLink) {
+            return dashboardDao.findDashboardsByTenantIdAndCustomerId(tenantId.getId(), id.getId(), pageLink);
+        }
+
+        @Override
+        protected void removeEntity(DashboardEntity entity) {
+            unassignDashboardFromCustomer(new DashboardId(entity.getId()));
+        }
+        
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDao.java
new file mode 100644
index 0000000..5390e95
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDao.java
@@ -0,0 +1,55 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.device;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.DeviceCredentialsEntity;
+
+/**
+ * The Interface DeviceCredentialsDao.
+ *
+ * @param <T> the generic type
+ */
+public interface DeviceCredentialsDao extends Dao<DeviceCredentialsEntity> {
+
+    /**
+     * Save or update device credentials object
+     *
+     * @param deviceCredentials the device credentials object
+     * @return saved device credentials object
+     */
+    DeviceCredentialsEntity save(DeviceCredentials deviceCredentials);
+
+    /**
+     * Find device credentials by device id.
+     *
+     * @param deviceId the device id
+     * @return the device credentials object
+     */
+    DeviceCredentialsEntity findByDeviceId(UUID deviceId);
+
+    /**
+     * Find device credentials by credentials id.
+     *
+     * @param credentialsId the credentials id
+     * @return the device credentials object
+     */
+    DeviceCredentialsEntity findByCredentialsId(String credentialsId);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDaoImpl.java
new file mode 100644
index 0000000..c38ea8c
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsDaoImpl.java
@@ -0,0 +1,77 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.device;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+
+import java.util.UUID;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.dao.AbstractModelDao;
+import org.thingsboard.server.dao.model.DeviceCredentialsEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
+
+import com.datastax.driver.core.querybuilder.Select.Where;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+@Component
+@Slf4j
+public class DeviceCredentialsDaoImpl extends AbstractModelDao<DeviceCredentialsEntity> implements DeviceCredentialsDao {
+
+    @Override
+    protected Class<DeviceCredentialsEntity> getColumnFamilyClass() {
+        return DeviceCredentialsEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public DeviceCredentialsEntity findByDeviceId(UUID deviceId) {
+        log.debug("Try to find device credentials by deviceId [{}] ", deviceId);
+        Where query = select().from(ModelConstants.DEVICE_CREDENTIALS_BY_DEVICE_COLUMN_FAMILY_NAME)
+                .where(eq(ModelConstants.DEVICE_CREDENTIALS_DEVICE_ID_PROPERTY, deviceId));
+        log.trace("Execute query {}", query);
+        DeviceCredentialsEntity deviceCredentialsEntity = findOneByStatement(query);
+        log.trace("Found device credentials [{}] by deviceId [{}]", deviceCredentialsEntity, deviceId);
+        return deviceCredentialsEntity;
+    }
+    
+    @Override
+    public DeviceCredentialsEntity findByCredentialsId(String credentialsId) {
+        log.debug("Try to find device credentials by credentialsId [{}] ", credentialsId);
+        Where query = select().from(ModelConstants.DEVICE_CREDENTIALS_BY_CREDENTIALS_ID_COLUMN_FAMILY_NAME)
+                .where(eq(ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_ID_PROPERTY, credentialsId));
+        log.trace("Execute query {}", query);
+        DeviceCredentialsEntity deviceCredentialsEntity = findOneByStatement(query);
+        log.trace("Found device credentials [{}] by credentialsId [{}]", deviceCredentialsEntity, credentialsId);
+        return deviceCredentialsEntity;
+    }
+
+    @Override
+    public DeviceCredentialsEntity save(DeviceCredentials deviceCredentials) {
+        log.debug("Save device credentials [{}] ", deviceCredentials);
+        return save(new DeviceCredentialsEntity(deviceCredentials));
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
new file mode 100644
index 0000000..43d2442
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsService.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.device;
+
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cache.annotation.Cacheable;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+
+import static org.thingsboard.server.common.data.CacheConstants.DEVICE_CREDENTIALS_CACHE;
+
+public interface DeviceCredentialsService {
+
+    DeviceCredentials findDeviceCredentialsByDeviceId(DeviceId deviceId);
+
+    @Cacheable(cacheNames = DEVICE_CREDENTIALS_CACHE, unless="#result == null")
+    DeviceCredentials findDeviceCredentialsByCredentialsId(String credentialsId);
+
+    @CacheEvict(cacheNames = DEVICE_CREDENTIALS_CACHE, keyGenerator="previousDeviceCredentialsId", beforeInvocation = true)
+    DeviceCredentials updateDeviceCredentials(DeviceCredentials deviceCredentials);
+
+    DeviceCredentials createDeviceCredentials(DeviceCredentials deviceCredentials);
+
+    @CacheEvict(cacheNames = DEVICE_CREDENTIALS_CACHE, key="#deviceCredentials.credentialsId")
+    void deleteDeviceCredentials(DeviceCredentials deviceCredentials);
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
new file mode 100644
index 0000000..19ad2d1
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
@@ -0,0 +1,134 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.device;
+
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.DeviceCredentialsEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+
+import java.util.Optional;
+
+import static org.thingsboard.server.dao.DaoUtil.getData;
+import static org.thingsboard.server.dao.service.Validator.validateId;
+import static org.thingsboard.server.dao.service.Validator.validateString;
+
+@Service
+@Slf4j
+public class DeviceCredentialsServiceImpl implements DeviceCredentialsService {
+
+    @Autowired
+    private DeviceCredentialsDao deviceCredentialsDao;
+
+    @Autowired
+    private DeviceService deviceService;
+
+    @Override
+    public DeviceCredentials findDeviceCredentialsByDeviceId(DeviceId deviceId) {
+        log.trace("Executing findDeviceCredentialsByDeviceId [{}]", deviceId);
+        validateId(deviceId, "Incorrect deviceId " + deviceId);
+        DeviceCredentialsEntity deviceCredentialsEntity = deviceCredentialsDao.findByDeviceId(deviceId.getId());
+        return getData(deviceCredentialsEntity);
+    }
+
+    @Override
+    public DeviceCredentials findDeviceCredentialsByCredentialsId(String credentialsId) {
+        log.trace("Executing findDeviceCredentialsByCredentialsId [{}]", credentialsId);
+        validateString(credentialsId, "Incorrect credentialsId " + credentialsId);
+        DeviceCredentialsEntity deviceCredentialsEntity = deviceCredentialsDao.findByCredentialsId(credentialsId);
+        return getData(deviceCredentialsEntity);
+    }
+
+    @Override
+    public DeviceCredentials updateDeviceCredentials(DeviceCredentials deviceCredentials) {
+        return saveOrUpdare(deviceCredentials);
+    }
+
+    @Override
+    public DeviceCredentials createDeviceCredentials(DeviceCredentials deviceCredentials) {
+        return saveOrUpdare(deviceCredentials);
+    }
+
+    private DeviceCredentials saveOrUpdare(DeviceCredentials deviceCredentials) {
+        log.trace("Executing updateDeviceCredentials [{}]", deviceCredentials);
+        credentialsValidator.validate(deviceCredentials);
+        return getData(deviceCredentialsDao.save(deviceCredentials));
+    }
+
+    @Override
+    public void deleteDeviceCredentials(DeviceCredentials deviceCredentials) {
+        log.trace("Executing deleteDeviceCredentials [{}]", deviceCredentials);
+        deviceCredentialsDao.removeById(deviceCredentials.getUuidId());
+    }
+
+    private DataValidator<DeviceCredentials> credentialsValidator =
+            new DataValidator<DeviceCredentials>() {
+
+                @Override
+                protected void validateCreate(DeviceCredentials deviceCredentials) {
+                    DeviceCredentialsEntity existingCredentialsEntity = deviceCredentialsDao.findByCredentialsId(deviceCredentials.getCredentialsId());
+                    if (existingCredentialsEntity != null) {
+                        throw new DataValidationException("Create of existent device credentials!");
+                    }
+                }
+
+                @Override
+                protected void validateUpdate(DeviceCredentials deviceCredentials) {
+                    DeviceCredentialsEntity existingCredentialsEntity = deviceCredentialsDao.findById(deviceCredentials.getUuidId());
+                    if (existingCredentialsEntity == null) {
+                        throw new DataValidationException("Unable to update non-existent device credentials!");
+                    }
+                    DeviceCredentialsEntity sameCredentialsIdEntity = deviceCredentialsDao.findByCredentialsId(deviceCredentials.getCredentialsId());
+                    if (sameCredentialsIdEntity != null && !sameCredentialsIdEntity.getId().equals(deviceCredentials.getUuidId())) {
+                        throw new DataValidationException("Specified credentials are already registered!");
+                    }
+                }
+
+                @Override
+                protected void validateDataImpl(DeviceCredentials deviceCredentials) {
+                    if (deviceCredentials.getDeviceId() == null) {
+                        throw new DataValidationException("Device credentials should be assigned to device!");
+                    }
+                    if (deviceCredentials.getCredentialsType() == null) {
+                        throw new DataValidationException("Device credentials type should be specified!");
+                    }
+                    if (StringUtils.isEmpty(deviceCredentials.getCredentialsId())) {
+                        throw new DataValidationException("Device credentials id should be specified!");
+                    }
+                    switch (deviceCredentials.getCredentialsType()) {
+                        case ACCESS_TOKEN:
+                            if (deviceCredentials.getCredentialsId().length() < 1 || deviceCredentials.getCredentialsId().length() > 20) {
+                                throw new DataValidationException("Incorrect access token length [" + deviceCredentials.getCredentialsId().length() + "]!");
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                    Device device = deviceService.findDeviceById(deviceCredentials.getDeviceId());
+                    if (device == null) {
+                        throw new DataValidationException("Can't assign device credentials to non-existent device!");
+                    }
+                }
+            };
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
new file mode 100644
index 0000000..0f00340
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
@@ -0,0 +1,68 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.device;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.DeviceEntity;
+
+/**
+ * The Interface DeviceDao.
+ *
+ */
+public interface DeviceDao extends Dao<DeviceEntity> {
+
+    /**
+     * Save or update device object
+     *
+     * @param device the device object
+     * @return saved device object
+     */
+    DeviceEntity save(Device device);
+
+    /**
+     * Find devices by tenantId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param pageLink the page link
+     * @return the list of device objects
+     */
+    List<DeviceEntity> findDevicesByTenantId(UUID tenantId, TextPageLink pageLink);
+    
+    /**
+     * Find devices by tenantId, customerId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param customerId the customerId
+     * @param pageLink the page link
+     * @return the list of device objects
+     */
+    List<DeviceEntity> findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink);
+
+    /**
+     * Find devices by tenantId and device name.
+     *
+     * @param tenantId the tenantId
+     * @param name the device name
+     * @return the optional device object
+     */
+    Optional<DeviceEntity> findDevicesByTenantIdAndName(UUID tenantId, String name);
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDaoImpl.java
new file mode 100644
index 0000000..719ad37
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceDaoImpl.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.device;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+import static org.thingsboard.server.dao.model.ModelConstants.*;
+
+import java.util.*;
+
+import com.datastax.driver.core.querybuilder.Select;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.DeviceEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Component
+@Slf4j
+public class DeviceDaoImpl extends AbstractSearchTextDao<DeviceEntity> implements DeviceDao {
+
+    @Override
+    protected Class<DeviceEntity> getColumnFamilyClass() {
+        return DeviceEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return DEVICE_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public DeviceEntity save(Device device) {
+        log.debug("Save device [{}] ", device);
+        return save(new DeviceEntity(device));
+    }
+
+    @Override
+    public List<DeviceEntity> findDevicesByTenantId(UUID tenantId, TextPageLink pageLink) {
+        log.debug("Try to find devices by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<DeviceEntity> deviceEntities = findPageWithTextSearch(DEVICE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Collections.singletonList(eq(DEVICE_TENANT_ID_PROPERTY, tenantId)), pageLink);
+
+        log.trace("Found devices [{}] by tenantId [{}] and pageLink [{}]", deviceEntities, tenantId, pageLink);
+        return deviceEntities;
+    }
+
+    @Override
+    public List<DeviceEntity> findDevicesByTenantIdAndCustomerId(UUID tenantId, UUID customerId, TextPageLink pageLink) {
+        log.debug("Try to find devices by tenantId [{}], customerId[{}] and pageLink [{}]", tenantId, customerId, pageLink);
+        List<DeviceEntity> deviceEntities = findPageWithTextSearch(DEVICE_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(DEVICE_CUSTOMER_ID_PROPERTY, customerId),
+                        eq(DEVICE_TENANT_ID_PROPERTY, tenantId)),
+                pageLink);
+
+        log.trace("Found devices [{}] by tenantId [{}], customerId [{}] and pageLink [{}]", deviceEntities, tenantId, customerId, pageLink);
+        return deviceEntities;
+    }
+
+    @Override
+    public Optional<DeviceEntity> findDevicesByTenantIdAndName(UUID tenantId, String deviceName) {
+        Select select = select().from(DEVICE_BY_TENANT_AND_NAME_VIEW_NAME);
+        Select.Where query = select.where();
+        query.and(eq(DEVICE_TENANT_ID_PROPERTY, tenantId));
+        query.and(eq(DEVICE_NAME_PROPERTY, deviceName));
+        return Optional.ofNullable(findOneByStatement(query));
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceService.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
new file mode 100644
index 0000000..eb3cb28
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.device;
+
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+
+public interface DeviceService {
+    
+    Device findDeviceById(DeviceId deviceId);
+
+    Device saveDevice(Device device);
+
+    Device assignDeviceToCustomer(DeviceId deviceId, CustomerId customerId);
+
+    Device unassignDeviceFromCustomer(DeviceId deviceId);
+
+    void deleteDevice(DeviceId deviceId);
+
+    TextPageData<Device> findDevicesByTenantId(TenantId tenantId, TextPageLink pageLink);
+
+    void deleteDevicesByTenantId(TenantId tenantId);
+
+    TextPageData<Device> findDevicesByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, TextPageLink pageLink);
+
+    void unassignCustomerDevices(TenantId tenantId, CustomerId customerId);
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
new file mode 100644
index 0000000..d321bf4
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
@@ -0,0 +1,231 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.device;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.dao.customer.CustomerDao;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.CustomerEntity;
+import org.thingsboard.server.dao.model.DeviceEntity;
+import org.thingsboard.server.dao.model.TenantEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.tenant.TenantDao;
+
+import java.util.List;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+import static org.thingsboard.server.dao.service.Validator.validateId;
+import static org.thingsboard.server.dao.service.Validator.validatePageLink;
+
+@Service
+@Slf4j
+public class DeviceServiceImpl implements DeviceService {
+
+    @Autowired
+    private DeviceDao deviceDao;
+
+    @Autowired
+    private TenantDao tenantDao;
+
+    @Autowired
+    private CustomerDao customerDao;
+
+    @Autowired
+    private DeviceCredentialsService deviceCredentialsService;
+
+    @Override
+    public Device findDeviceById(DeviceId deviceId) {
+        log.trace("Executing findDeviceById [{}]", deviceId);
+        validateId(deviceId, "Incorrect deviceId " + deviceId);
+        DeviceEntity deviceEntity = deviceDao.findById(deviceId.getId());
+        return getData(deviceEntity);
+    }
+
+    @Override
+    public Device saveDevice(Device device) {
+        log.trace("Executing saveDevice [{}]", device);
+        deviceValidator.validate(device);
+        DeviceEntity deviceEntity = deviceDao.save(device);
+        if (device.getId() == null) {
+            DeviceCredentials deviceCredentials = new DeviceCredentials();
+            deviceCredentials.setDeviceId(new DeviceId(deviceEntity.getId()));
+            deviceCredentials.setCredentialsType(DeviceCredentialsType.ACCESS_TOKEN);
+            deviceCredentials.setCredentialsId(RandomStringUtils.randomAlphanumeric(20));
+            deviceCredentialsService.createDeviceCredentials(deviceCredentials);
+        }
+        return getData(deviceEntity);
+    }
+
+    @Override
+    public Device assignDeviceToCustomer(DeviceId deviceId, CustomerId customerId) {
+        Device device = findDeviceById(deviceId);
+        device.setCustomerId(customerId);
+        return saveDevice(device);
+    }
+
+    @Override
+    public Device unassignDeviceFromCustomer(DeviceId deviceId) {
+        Device device = findDeviceById(deviceId);
+        device.setCustomerId(null);
+        return saveDevice(device);
+    }
+
+    @Override
+    public void deleteDevice(DeviceId deviceId) {
+        log.trace("Executing deleteDevice [{}]", deviceId);
+        validateId(deviceId, "Incorrect deviceId " + deviceId);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(deviceId);
+        if (deviceCredentials != null) {
+            deviceCredentialsService.deleteDeviceCredentials(deviceCredentials);
+        }
+        deviceDao.removeById(deviceId.getId());
+    }
+
+    @Override
+    public TextPageData<Device> findDevicesByTenantId(TenantId tenantId, TextPageLink pageLink) {
+        log.trace("Executing findDevicesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<DeviceEntity> deviceEntities = deviceDao.findDevicesByTenantId(tenantId.getId(), pageLink);
+        List<Device> devices = convertDataList(deviceEntities);
+        return new TextPageData<Device>(devices, pageLink);
+    }
+
+    @Override
+    public void deleteDevicesByTenantId(TenantId tenantId) {
+        log.trace("Executing deleteDevicesByTenantId, tenantId [{}]", tenantId);
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        tenantDevicesRemover.removeEntitites(tenantId);
+    }
+
+    @Override
+    public TextPageData<Device> findDevicesByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, TextPageLink pageLink) {
+        log.trace("Executing findDevicesByTenantIdAndCustomerId, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        validateId(customerId, "Incorrect customerId " + customerId);
+        validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<DeviceEntity> deviceEntities = deviceDao.findDevicesByTenantIdAndCustomerId(tenantId.getId(), customerId.getId(), pageLink);
+        List<Device> devices = convertDataList(deviceEntities);
+        return new TextPageData<Device>(devices, pageLink);
+    }
+
+    @Override
+    public void unassignCustomerDevices(TenantId tenantId, CustomerId customerId) {
+        log.trace("Executing unassignCustomerDevices, tenantId [{}], customerId [{}]", tenantId, customerId);
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        validateId(customerId, "Incorrect customerId " + customerId);
+        new CustomerDevicesUnassigner(tenantId).removeEntitites(customerId);
+    }
+
+    private DataValidator<Device> deviceValidator =
+            new DataValidator<Device>() {
+
+                @Override
+                protected void validateCreate(Device device) {
+                    deviceDao.findDevicesByTenantIdAndName(device.getTenantId().getId(), device.getName()).ifPresent(
+                            d -> {
+                                throw new DataValidationException("Device with such name already exists!");
+                            }
+                    );
+                }
+
+                @Override
+                protected void validateUpdate(Device device) {
+                    deviceDao.findDevicesByTenantIdAndName(device.getTenantId().getId(), device.getName()).ifPresent(
+                            d -> {
+                                if (!d.getId().equals(device.getUuidId())) {
+                                    throw new DataValidationException("Device with such name already exists!");
+                                }
+                            }
+                    );
+                }
+
+                @Override
+                protected void validateDataImpl(Device device) {
+                    if (StringUtils.isEmpty(device.getName())) {
+                        throw new DataValidationException("Device name should be specified!");
+                    }
+                    if (device.getTenantId() == null) {
+                        throw new DataValidationException("Device should be assigned to tenant!");
+                    } else {
+                        TenantEntity tenant = tenantDao.findById(device.getTenantId().getId());
+                        if (tenant == null) {
+                            throw new DataValidationException("Device is referencing to non-existent tenant!");
+                        }
+                    }
+                    if (device.getCustomerId() == null) {
+                        device.setCustomerId(new CustomerId(NULL_UUID));
+                    } else if (!device.getCustomerId().getId().equals(NULL_UUID)) {
+                        CustomerEntity customer = customerDao.findById(device.getCustomerId().getId());
+                        if (customer == null) {
+                            throw new DataValidationException("Can't assign device to non-existent customer!");
+                        }
+                        if (!customer.getTenantId().equals(device.getTenantId().getId())) {
+                            throw new DataValidationException("Can't assign device to customer from different tenant!");
+                        }
+                    }
+                }
+            };
+
+    private PaginatedRemover<TenantId, DeviceEntity> tenantDevicesRemover =
+            new PaginatedRemover<TenantId, DeviceEntity>() {
+
+                @Override
+                protected List<DeviceEntity> findEntities(TenantId id, TextPageLink pageLink) {
+                    return deviceDao.findDevicesByTenantId(id.getId(), pageLink);
+                }
+
+                @Override
+                protected void removeEntity(DeviceEntity entity) {
+                    deleteDevice(new DeviceId(entity.getId()));
+                }
+            };
+
+    class CustomerDevicesUnassigner extends PaginatedRemover<CustomerId, DeviceEntity> {
+
+        private TenantId tenantId;
+
+        CustomerDevicesUnassigner(TenantId tenantId) {
+            this.tenantId = tenantId;
+        }
+
+        @Override
+        protected List<DeviceEntity> findEntities(CustomerId id, TextPageLink pageLink) {
+            return deviceDao.findDevicesByTenantIdAndCustomerId(tenantId.getId(), id.getId(), pageLink);
+        }
+
+        @Override
+        protected void removeEntity(DeviceEntity entity) {
+            unassignDeviceFromCustomer(new DeviceId(entity.getId()));
+        }
+
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventDao.java
new file mode 100644
index 0000000..736b825
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventDao.java
@@ -0,0 +1,136 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.event;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.querybuilder.Insert;
+import com.datastax.driver.core.querybuilder.QueryBuilder;
+import com.datastax.driver.core.querybuilder.Select;
+import com.datastax.driver.core.utils.UUIDs;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.dao.AbstractSearchTimeDao;
+import org.thingsboard.server.dao.model.EventEntity;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+import static org.thingsboard.server.dao.model.ModelConstants.EVENT_BY_ID_VIEW_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.EVENT_BY_TYPE_AND_ID_VIEW_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.EVENT_COLUMN_FAMILY_NAME;
+
+@Component
+@Slf4j
+public class BaseEventDao extends AbstractSearchTimeDao<EventEntity> implements EventDao {
+
+    @Override
+    protected Class<EventEntity> getColumnFamilyClass() {
+        return EventEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return EVENT_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public EventEntity save(Event event) {
+        log.debug("Save event [{}] ", event);
+        return save(new EventEntity(event), false).orElse(null);
+    }
+
+    @Override
+    public Optional<EventEntity> saveIfNotExists(Event event) {
+        return save(new EventEntity(event), true);
+    }
+
+    @Override
+    public EventEntity findEvent(UUID tenantId, EntityId entityId, String eventType, String eventUid) {
+        log.debug("Search event entity by [{}][{}][{}][{}]", tenantId, entityId, eventType, eventUid);
+        Select.Where query = select().from(getColumnFamilyName()).where(
+                eq(ModelConstants.EVENT_TENANT_ID_PROPERTY, tenantId))
+                .and(eq(ModelConstants.EVENT_ENTITY_TYPE_PROPERTY, entityId.getEntityType()))
+                .and(eq(ModelConstants.EVENT_ENTITY_ID_PROPERTY, entityId.getId()))
+                .and(eq(ModelConstants.EVENT_TYPE_PROPERTY, eventType))
+                .and(eq(ModelConstants.EVENT_UID_PROPERTY, eventUid));
+        log.trace("Execute query [{}]", query);
+        EventEntity entity = findOneByStatement(query);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}] for event entity [{}]", entity != null, entity);
+        } else {
+            log.debug("Search result: [{}]", entity != null);
+        }
+        return entity;
+    }
+
+    @Override
+    public List<EventEntity> findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink) {
+        log.trace("Try to find events by tenant [{}], entity [{}]and pageLink [{}]", tenantId, entityId, pageLink);
+        List<EventEntity> entities = findPageWithTimeSearch(EVENT_BY_ID_VIEW_NAME,
+                Arrays.asList(eq(ModelConstants.EVENT_TENANT_ID_PROPERTY, tenantId),
+                        eq(ModelConstants.EVENT_ENTITY_TYPE_PROPERTY, entityId.getEntityType()),
+                        eq(ModelConstants.EVENT_ENTITY_ID_PROPERTY, entityId.getId())),
+                pageLink);
+        log.trace("Found events by tenant [{}], entity [{}] and pageLink [{}]", tenantId, entityId, pageLink);
+        return entities;
+    }
+
+    @Override
+    public List<EventEntity> findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink) {
+        log.trace("Try to find events by tenant [{}], entity [{}], type [{}] and pageLink [{}]", tenantId, entityId, eventType, pageLink);
+        List<EventEntity> entities = findPageWithTimeSearch(EVENT_BY_TYPE_AND_ID_VIEW_NAME,
+                Arrays.asList(eq(ModelConstants.EVENT_TENANT_ID_PROPERTY, tenantId),
+                        eq(ModelConstants.EVENT_ENTITY_TYPE_PROPERTY, entityId.getEntityType()),
+                        eq(ModelConstants.EVENT_ENTITY_ID_PROPERTY, entityId.getId()),
+                        eq(ModelConstants.EVENT_TYPE_PROPERTY, eventType)),
+                pageLink.isAscOrder() ? QueryBuilder.asc(ModelConstants.EVENT_TYPE_PROPERTY) :
+                        QueryBuilder.desc(ModelConstants.EVENT_TYPE_PROPERTY),
+                pageLink);
+        log.trace("Found events by tenant [{}], entity [{}], type [{}] and pageLink [{}]", tenantId, entityId, eventType, pageLink);
+        return entities;
+    }
+
+    private Optional<EventEntity> save(EventEntity entity, boolean ifNotExists) {
+        if (entity.getId() == null) {
+            entity.setId(UUIDs.timeBased());
+        }
+        Insert insert = QueryBuilder.insertInto(getColumnFamilyName())
+                .value(ModelConstants.ID_PROPERTY, entity.getId())
+                .value(ModelConstants.EVENT_TENANT_ID_PROPERTY, entity.getTenantId())
+                .value(ModelConstants.EVENT_ENTITY_TYPE_PROPERTY, entity.getEntityType())
+                .value(ModelConstants.EVENT_ENTITY_ID_PROPERTY, entity.getEntityId())
+                .value(ModelConstants.EVENT_TYPE_PROPERTY, entity.getEventType())
+                .value(ModelConstants.EVENT_UID_PROPERTY, entity.getEventUId())
+                .value(ModelConstants.EVENT_BODY_PROPERTY, entity.getBody());
+        if (ifNotExists) {
+            insert = insert.ifNotExists();
+        }
+        ResultSet rs = executeWrite(insert);
+        if (rs.wasApplied()) {
+            return Optional.of(entity);
+        } else {
+            return Optional.empty();
+        }
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
new file mode 100644
index 0000000..9e86a94
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/BaseEventService.java
@@ -0,0 +1,130 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.event;
+
+import com.datastax.driver.core.utils.UUIDs;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.EventId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TimePageData;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.EventEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+
+import java.util.List;
+import java.util.Optional;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+
+@Service
+@Slf4j
+public class BaseEventService implements EventService {
+
+    private final TenantId systemTenantId = new TenantId(NULL_UUID);
+
+    @Autowired
+    public EventDao eventDao;
+
+    @Override
+    public Event save(Event event) {
+        eventValidator.validate(event);
+        if (event.getTenantId() == null) {
+            log.trace("Save system event with predefined id {}", systemTenantId);
+            event.setTenantId(systemTenantId);
+        }
+        if (event.getId() == null) {
+            event.setId(new EventId(UUIDs.timeBased()));
+        }
+        if (StringUtils.isEmpty(event.getUid())) {
+            event.setUid(event.getId().toString());
+        }
+        return getData(eventDao.save(event));
+    }
+
+    @Override
+    public Optional<Event> saveIfNotExists(Event event) {
+        eventValidator.validate(event);
+        if (StringUtils.isEmpty(event.getUid())) {
+            throw new DataValidationException("Event uid should be specified!.");
+        }
+        if (event.getTenantId() == null) {
+            log.trace("Save system event with predefined id {}", systemTenantId);
+            event.setTenantId(systemTenantId);
+        }
+        if (event.getId() == null) {
+            event.setId(new EventId(UUIDs.timeBased()));
+        }
+        Optional<EventEntity> result = eventDao.saveIfNotExists(event);
+        return result.isPresent() ? Optional.of(getData(result.get())) : Optional.empty();
+    }
+
+    @Override
+    public Optional<Event> findEvent(TenantId tenantId, EntityId entityId, String eventType, String eventUid) {
+        if (tenantId == null) {
+            throw new DataValidationException("Tenant id should be specified!.");
+        }
+        if (entityId == null) {
+            throw new DataValidationException("Entity id should be specified!.");
+        }
+        if (StringUtils.isEmpty(eventType)) {
+            throw new DataValidationException("Event type should be specified!.");
+        }
+        if (StringUtils.isEmpty(eventUid)) {
+            throw new DataValidationException("Event uid should be specified!.");
+        }
+        EventEntity entity = eventDao.findEvent(tenantId.getId(), entityId, eventType, eventUid);
+        return entity != null ? Optional.of(getData(entity)) : Optional.empty();
+    }
+
+    @Override
+    public TimePageData<Event> findEvents(TenantId tenantId, EntityId entityId, TimePageLink pageLink) {
+        List<EventEntity> entities = eventDao.findEvents(tenantId.getId(), entityId, pageLink);
+        List<Event> events = convertDataList(entities);
+        return new TimePageData<Event>(events, pageLink);
+    }
+
+
+    @Override
+    public TimePageData<Event> findEvents(TenantId tenantId, EntityId entityId, String eventType, TimePageLink pageLink) {
+        List<EventEntity> entities = eventDao.findEvents(tenantId.getId(), entityId, eventType, pageLink);
+        List<Event> events = convertDataList(entities);
+        return new TimePageData<Event>(events, pageLink);
+    }
+
+    private DataValidator<Event> eventValidator =
+            new DataValidator<Event>() {
+                @Override
+                protected void validateDataImpl(Event event) {
+                    if (event.getEntityId() == null) {
+                        throw new DataValidationException("Entity id should be specified!.");
+                    }
+                    if (StringUtils.isEmpty(event.getType())) {
+                        throw new DataValidationException("Event type should be specified!.");
+                    }
+                    if (event.getBody() == null) {
+                        throw new DataValidationException("Event body should be specified!.");
+                    }
+                }
+            };
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java
new file mode 100644
index 0000000..4d7b1f6
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/EventDao.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.event;
+
+import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.EventEntity;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+/**
+ * The Interface DeviceDao.
+ *
+ * @param <T> the generic type
+ */
+public interface EventDao extends Dao<EventEntity> {
+
+    /**
+     * Save or update event object
+     *
+     * @param event the event object
+     * @return saved event object
+     */
+    EventEntity save(Event event);
+
+    /**
+     * Save event object if it is not yet saved
+     *
+     * @param event the event object
+     * @return saved event object
+     */
+    Optional<EventEntity> saveIfNotExists(Event event);
+
+    /**
+     * Find event by tenantId, entityId and eventUid.
+     *
+     * @param tenantId the tenantId
+     * @param entityId the entityId
+     * @param eventType the eventType
+     * @param eventUid the eventUid
+     * @return the event
+     */
+    EventEntity findEvent(UUID tenantId, EntityId entityId, String eventType, String eventUid);
+
+    /**
+     * Find events by tenantId, entityId and pageLink.
+     *
+     * @param tenantId the tenantId
+     * @param entityId the entityId
+     * @param pageLink the pageLink
+     * @return the event list
+     */
+    List<EventEntity> findEvents(UUID tenantId, EntityId entityId, TimePageLink pageLink);
+
+    /**
+     * Find events by tenantId, entityId, eventType and pageLink.
+     *
+     * @param tenantId the tenantId
+     * @param entityId the entityId
+     * @param eventType the eventType
+     * @param pageLink the pageLink
+     * @return the event list
+     */
+    List<EventEntity> findEvents(UUID tenantId, EntityId entityId, String eventType, TimePageLink pageLink);
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/EventService.java b/dao/src/main/java/org/thingsboard/server/dao/event/EventService.java
new file mode 100644
index 0000000..386f894
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/EventService.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.event;
+
+import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TimePageData;
+import org.thingsboard.server.common.data.page.TimePageLink;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface EventService {
+
+    Event save(Event event);
+
+    Optional<Event> saveIfNotExists(Event event);
+
+    Optional<Event> findEvent(TenantId tenantId, EntityId entityId, String eventType, String eventUid);
+
+    TimePageData<Event> findEvents(TenantId tenantId, EntityId entityId, TimePageLink pageLink);
+
+    TimePageData<Event> findEvents(TenantId tenantId, EntityId entityId, String eventType, TimePageLink pageLink);
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/exception/DatabaseException.java b/dao/src/main/java/org/thingsboard/server/dao/exception/DatabaseException.java
new file mode 100644
index 0000000..9cd6b04
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/exception/DatabaseException.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.exception;
+
+public class DatabaseException extends RuntimeException {
+
+	private static final long serialVersionUID = 3463762014441887103L;
+
+	public DatabaseException() {
+		super();
+	}
+
+	public DatabaseException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public DatabaseException(String message) {
+		super(message);
+	}
+
+	public DatabaseException(Throwable cause) {
+		super(cause);
+	}
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/exception/DataValidationException.java b/dao/src/main/java/org/thingsboard/server/dao/exception/DataValidationException.java
new file mode 100644
index 0000000..4a69ec7
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/exception/DataValidationException.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.exception;
+
+public class DataValidationException extends RuntimeException {
+
+    private static final long serialVersionUID = 7659985660312721830L;
+
+    public DataValidationException(String message) {
+        super(message);
+    }
+
+    public DataValidationException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/exception/IncorrectParameterException.java b/dao/src/main/java/org/thingsboard/server/dao/exception/IncorrectParameterException.java
new file mode 100644
index 0000000..7ee8fb1
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/exception/IncorrectParameterException.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.exception;
+
+
+public class IncorrectParameterException extends RuntimeException {
+
+	private static final long serialVersionUID = 601995650578985289L;
+
+	public IncorrectParameterException(String message) {
+        super(message);
+    }
+
+    public IncorrectParameterException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/AdminSettingsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/AdminSettingsEntity.java
new file mode 100644
index 0000000..3e72fcb
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/AdminSettingsEntity.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_JSON_VALUE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_KEY_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.id.AdminSettingsId;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import com.fasterxml.jackson.databind.JsonNode;
+
+@Table(name = ADMIN_SETTINGS_COLUMN_FAMILY_NAME)
+public final class AdminSettingsEntity implements BaseEntity<AdminSettings> {
+
+    @Transient
+    private static final long serialVersionUID = 899117723388310403L;
+    
+    @PartitionKey(value = 0)
+    @Column(name = ID_PROPERTY)
+    private UUID id;
+    
+    @Column(name = ADMIN_SETTINGS_KEY_PROPERTY)
+    private String key;
+
+    @Column(name = ADMIN_SETTINGS_JSON_VALUE_PROPERTY, codec = JsonCodec.class)
+    private JsonNode jsonValue;
+
+    public AdminSettingsEntity() {
+        super();
+    }
+
+    public AdminSettingsEntity(AdminSettings adminSettings) {
+        if (adminSettings.getId() != null) {
+            this.id = adminSettings.getId().getId();
+        }
+        this.key = adminSettings.getKey();
+        this.jsonValue = adminSettings.getJsonValue();
+    }
+    
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+    
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
+
+    public JsonNode getJsonValue() {
+        return jsonValue;
+    }
+
+    public void setJsonValue(JsonNode jsonValue) {
+        this.jsonValue = jsonValue;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((jsonValue == null) ? 0 : jsonValue.hashCode());
+        result = prime * result + ((key == null) ? 0 : key.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        AdminSettingsEntity other = (AdminSettingsEntity) obj;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (jsonValue == null) {
+            if (other.jsonValue != null)
+                return false;
+        } else if (!jsonValue.equals(other.jsonValue))
+            return false;
+        if (key == null) {
+            if (other.key != null)
+                return false;
+        } else if (!key.equals(other.key))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("AdminSettingsEntity [id=");
+        builder.append(id);
+        builder.append(", key=");
+        builder.append(key);
+        builder.append(", jsonValue=");
+        builder.append(jsonValue);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public AdminSettings toData() {
+        AdminSettings adminSettings = new AdminSettings(new AdminSettingsId(id));
+        adminSettings.setCreatedTime(UUIDs.unixTimestamp(id));
+        adminSettings.setKey(key);
+        adminSettings.setJsonValue(jsonValue);
+        return adminSettings;
+    }
+
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/BaseEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/BaseEntity.java
new file mode 100644
index 0000000..02828ec
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/BaseEntity.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import java.io.Serializable;
+import java.util.UUID;
+
+public interface BaseEntity<D> extends ToData<D>, Serializable {
+
+    UUID getId();
+
+    void setId(UUID id);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ComponentDescriptorEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/ComponentDescriptorEntity.java
new file mode 100644
index 0000000..99851de
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/ComponentDescriptorEntity.java
@@ -0,0 +1,162 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.id.ComponentDescriptorId;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentScope;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import java.util.UUID;
+
+/**
+ * @author Andrew Shvayka
+ */
+@Table(name = ModelConstants.COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME)
+public class ComponentDescriptorEntity implements SearchTextEntity<ComponentDescriptor> {
+
+    private static final long serialVersionUID = 1L;
+
+    @PartitionKey
+    @Column(name = ModelConstants.ID_PROPERTY)
+    private UUID id;
+
+    @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_TYPE_PROPERTY)
+    private ComponentType type;
+
+    @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_SCOPE_PROPERTY)
+    private ComponentScope scope;
+
+    @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_NAME_PROPERTY)
+    private String name;
+
+    @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_CLASS_PROPERTY)
+    private String clazz;
+
+    @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_CONFIGURATION_DESCRIPTOR_PROPERTY, codec = JsonCodec.class)
+    private JsonNode configurationDescriptor;
+
+    @Column(name = ModelConstants.COMPONENT_DESCRIPTOR_ACTIONS_PROPERTY)
+    private String actions;
+
+    @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY)
+    private String searchText;
+
+    public ComponentDescriptorEntity() {
+    }
+
+    public ComponentDescriptorEntity(ComponentDescriptor component) {
+        if (component.getId() != null) {
+            this.id = component.getId().getId();
+        }
+        this.actions = component.getActions();
+        this.type = component.getType();
+        this.scope = component.getScope();
+        this.name = component.getName();
+        this.clazz = component.getClazz();
+        this.configurationDescriptor = component.getConfigurationDescriptor();
+        this.searchText = component.getName();
+    }
+
+    @Override
+    public ComponentDescriptor toData() {
+        ComponentDescriptor data = new ComponentDescriptor(new ComponentDescriptorId(id));
+        data.setType(type);
+        data.setScope(scope);
+        data.setName(this.getName());
+        data.setClazz(this.getClazz());
+        data.setActions(this.getActions());
+        data.setConfigurationDescriptor(this.getConfigurationDescriptor());
+        return data;
+    }
+
+    @Override
+    public UUID getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getActions() {
+        return actions;
+    }
+
+    public void setActions(String actions) {
+        this.actions = actions;
+    }
+
+    public ComponentType getType() {
+        return type;
+    }
+
+    public void setType(ComponentType type) {
+        this.type = type;
+    }
+
+    public ComponentScope getScope() {
+        return scope;
+    }
+
+    public void setScope(ComponentScope scope) {
+        this.scope = scope;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getClazz() {
+        return clazz;
+    }
+
+    public void setClazz(String clazz) {
+        this.clazz = clazz;
+    }
+
+    public JsonNode getConfigurationDescriptor() {
+        return configurationDescriptor;
+    }
+
+    public void setConfigurationDescriptor(JsonNode configurationDescriptor) {
+        this.configurationDescriptor = configurationDescriptor;
+    }
+
+    public String getSearchText() {
+        return searchText;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+
+    @Override
+    public String getSearchTextSource() {
+        return searchText;
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/CustomerEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/CustomerEntity.java
new file mode 100644
index 0000000..5c26189
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/CustomerEntity.java
@@ -0,0 +1,365 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import static org.thingsboard.server.dao.model.ModelConstants.ADDRESS2_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ADDRESS_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.CITY_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.COUNTRY_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_ADDITIONAL_INFO_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_TENANT_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.CUSTOMER_TITLE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.EMAIL_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.PHONE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.STATE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ZIP_PROPERTY;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import com.fasterxml.jackson.databind.JsonNode;
+
+@Table(name = CUSTOMER_COLUMN_FAMILY_NAME)
+public final class CustomerEntity implements SearchTextEntity<Customer> {
+
+    @Transient
+    private static final long serialVersionUID = -7732527103760948490L;
+    
+    @PartitionKey(value = 0)
+    @Column(name = ID_PROPERTY)
+    private UUID id;
+    
+    @PartitionKey(value = 1)
+    @Column(name = CUSTOMER_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+    
+    @Column(name = CUSTOMER_TITLE_PROPERTY)
+    private String title;
+    
+    @Column(name = SEARCH_TEXT_PROPERTY)
+    private String searchText;
+    
+    @Column(name = COUNTRY_PROPERTY)
+    private String country;
+    
+    @Column(name = STATE_PROPERTY)
+    private String state;
+
+    @Column(name = CITY_PROPERTY)
+    private String city;
+
+    @Column(name = ADDRESS_PROPERTY)
+    private String address;
+
+    @Column(name = ADDRESS2_PROPERTY)
+    private String address2;
+
+    @Column(name = ZIP_PROPERTY)
+    private String zip;
+
+    @Column(name = PHONE_PROPERTY)
+    private String phone;
+
+    @Column(name = EMAIL_PROPERTY)
+    private String email;
+
+    @Column(name = CUSTOMER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
+    private JsonNode additionalInfo;
+
+    public CustomerEntity() {
+        super();
+    }
+
+    public CustomerEntity(Customer customer) {
+        if (customer.getId() != null) {
+            this.id = customer.getId().getId();
+        }
+        this.tenantId = customer.getTenantId().getId();
+        this.title = customer.getTitle();
+        this.country = customer.getCountry();
+        this.state = customer.getState();
+        this.city = customer.getCity();
+        this.address = customer.getAddress();
+        this.address2 = customer.getAddress2();
+        this.zip = customer.getZip();
+        this.phone = customer.getPhone();
+        this.email = customer.getEmail();
+        this.additionalInfo = customer.getAdditionalInfo();
+    }
+    
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(UUID tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddress2() {
+        return address2;
+    }
+
+    public void setAddress2(String address2) {
+        this.address2 = address2;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public JsonNode getAdditionalInfo() {
+        return additionalInfo;
+    }
+
+    public void setAdditionalInfo(JsonNode additionalInfo) {
+        this.additionalInfo = additionalInfo;
+    }
+    
+    @Override
+    public String getSearchTextSource() {
+        return title;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+    
+    public String getSearchText() {
+        return searchText;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode());
+        result = prime * result + ((address == null) ? 0 : address.hashCode());
+        result = prime * result + ((address2 == null) ? 0 : address2.hashCode());
+        result = prime * result + ((city == null) ? 0 : city.hashCode());
+        result = prime * result + ((country == null) ? 0 : country.hashCode());
+        result = prime * result + ((email == null) ? 0 : email.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((phone == null) ? 0 : phone.hashCode());
+        result = prime * result + ((state == null) ? 0 : state.hashCode());
+        result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode());
+        result = prime * result + ((title == null) ? 0 : title.hashCode());
+        result = prime * result + ((zip == null) ? 0 : zip.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        CustomerEntity other = (CustomerEntity) obj;
+        if (additionalInfo == null) {
+            if (other.additionalInfo != null)
+                return false;
+        } else if (!additionalInfo.equals(other.additionalInfo))
+            return false;
+        if (address == null) {
+            if (other.address != null)
+                return false;
+        } else if (!address.equals(other.address))
+            return false;
+        if (address2 == null) {
+            if (other.address2 != null)
+                return false;
+        } else if (!address2.equals(other.address2))
+            return false;
+        if (city == null) {
+            if (other.city != null)
+                return false;
+        } else if (!city.equals(other.city))
+            return false;
+        if (country == null) {
+            if (other.country != null)
+                return false;
+        } else if (!country.equals(other.country))
+            return false;
+        if (email == null) {
+            if (other.email != null)
+                return false;
+        } else if (!email.equals(other.email))
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (phone == null) {
+            if (other.phone != null)
+                return false;
+        } else if (!phone.equals(other.phone))
+            return false;
+        if (state == null) {
+            if (other.state != null)
+                return false;
+        } else if (!state.equals(other.state))
+            return false;
+        if (tenantId == null) {
+            if (other.tenantId != null)
+                return false;
+        } else if (!tenantId.equals(other.tenantId))
+            return false;
+        if (title == null) {
+            if (other.title != null)
+                return false;
+        } else if (!title.equals(other.title))
+            return false;
+        if (zip == null) {
+            if (other.zip != null)
+                return false;
+        } else if (!zip.equals(other.zip))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("CustomerEntity [id=");
+        builder.append(id);
+        builder.append(", tenantId=");
+        builder.append(tenantId);
+        builder.append(", title=");
+        builder.append(title);
+        builder.append(", country=");
+        builder.append(country);
+        builder.append(", state=");
+        builder.append(state);
+        builder.append(", city=");
+        builder.append(city);
+        builder.append(", address=");
+        builder.append(address);
+        builder.append(", address2=");
+        builder.append(address2);
+        builder.append(", zip=");
+        builder.append(zip);
+        builder.append(", phone=");
+        builder.append(phone);
+        builder.append(", email=");
+        builder.append(email);
+        builder.append(", additionalInfo=");
+        builder.append(additionalInfo);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public Customer toData() {
+        Customer customer = new Customer(new CustomerId(id));
+        customer.setCreatedTime(UUIDs.unixTimestamp(id));
+        customer.setTenantId(new TenantId(tenantId));
+        customer.setTitle(title);
+        customer.setCountry(country);
+        customer.setState(state);
+        customer.setCity(city);
+        customer.setAddress(address);
+        customer.setAddress2(address2);
+        customer.setZip(zip);
+        customer.setPhone(phone);
+        customer.setEmail(email);
+        customer.setAdditionalInfo(additionalInfo);
+        return customer;
+    }
+
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/DashboardEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/DashboardEntity.java
new file mode 100644
index 0000000..cf74d82
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/DashboardEntity.java
@@ -0,0 +1,221 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DashboardId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import com.fasterxml.jackson.databind.JsonNode;
+
+@Table(name = ModelConstants.DASHBOARD_COLUMN_FAMILY_NAME)
+public final class DashboardEntity implements SearchTextEntity<Dashboard> {
+    
+    @Transient
+    private static final long serialVersionUID = 2998395951247446191L;
+
+    @PartitionKey(value = 0)
+    @Column(name = ModelConstants.ID_PROPERTY)
+    private UUID id;
+    
+    @PartitionKey(value = 1)
+    @Column(name = ModelConstants.DASHBOARD_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+
+    @PartitionKey(value = 2)
+    @Column(name = ModelConstants.DASHBOARD_CUSTOMER_ID_PROPERTY)
+    private UUID customerId;
+
+    @Column(name = ModelConstants.DASHBOARD_TITLE_PROPERTY)
+    private String title;
+    
+    @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY)
+    private String searchText;
+    
+    @Column(name = ModelConstants.DASHBOARD_CONFIGURATION_PROPERTY, codec = JsonCodec.class)
+    private JsonNode configuration;
+
+    public DashboardEntity() {
+        super();
+    }
+
+    public DashboardEntity(Dashboard dashboard) {
+        if (dashboard.getId() != null) {
+            this.id = dashboard.getId().getId();
+        }
+        if (dashboard.getTenantId() != null) {
+            this.tenantId = dashboard.getTenantId().getId();
+        }
+        if (dashboard.getCustomerId() != null) {
+            this.customerId = dashboard.getCustomerId().getId();
+        }
+        this.title = dashboard.getTitle();
+        this.configuration = dashboard.getConfiguration();
+    }
+    
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(UUID tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public UUID getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(UUID customerId) {
+        this.customerId = customerId;
+    }
+    
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public JsonNode getConfiguration() {
+        return configuration;
+    }
+
+    public void setConfiguration(JsonNode configuration) {
+        this.configuration = configuration;
+    }
+    
+    @Override
+    public String getSearchTextSource() {
+        return title;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+    
+    public String getSearchText() {
+        return searchText;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((configuration == null) ? 0 : configuration.hashCode());
+        result = prime * result + ((customerId == null) ? 0 : customerId.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((searchText == null) ? 0 : searchText.hashCode());
+        result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode());
+        result = prime * result + ((title == null) ? 0 : title.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        DashboardEntity other = (DashboardEntity) obj;
+        if (configuration == null) {
+            if (other.configuration != null)
+                return false;
+        } else if (!configuration.equals(other.configuration))
+            return false;
+        if (customerId == null) {
+            if (other.customerId != null)
+                return false;
+        } else if (!customerId.equals(other.customerId))
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (searchText == null) {
+            if (other.searchText != null)
+                return false;
+        } else if (!searchText.equals(other.searchText))
+            return false;
+        if (tenantId == null) {
+            if (other.tenantId != null)
+                return false;
+        } else if (!tenantId.equals(other.tenantId))
+            return false;
+        if (title == null) {
+            if (other.title != null)
+                return false;
+        } else if (!title.equals(other.title))
+            return false;
+        return true;
+    }
+    
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("DashboardEntity [id=");
+        builder.append(id);
+        builder.append(", tenantId=");
+        builder.append(tenantId);
+        builder.append(", customerId=");
+        builder.append(customerId);
+        builder.append(", title=");
+        builder.append(title);
+        builder.append(", searchText=");
+        builder.append(searchText);
+        builder.append(", configuration=");
+        builder.append(configuration);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public Dashboard toData() {
+        Dashboard dashboard = new Dashboard(new DashboardId(id));
+        dashboard.setCreatedTime(UUIDs.unixTimestamp(id));
+        if (tenantId != null) {
+            dashboard.setTenantId(new TenantId(tenantId));
+        }
+        if (customerId != null) {
+            dashboard.setCustomerId(new CustomerId(customerId));
+        }
+        dashboard.setTitle(title);
+        dashboard.setConfiguration(configuration);
+        return dashboard;
+    }
+
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/DeviceCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/DeviceCredentialsEntity.java
new file mode 100644
index 0000000..5a1fd28
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/DeviceCredentialsEntity.java
@@ -0,0 +1,186 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.id.DeviceCredentialsId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.dao.model.type.DeviceCredentialsTypeCodec;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+
+@Table(name = ModelConstants.DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME)
+public final class DeviceCredentialsEntity implements BaseEntity<DeviceCredentials> {
+
+    @Transient
+    private static final long serialVersionUID = -2667310560260623272L;
+    
+    @PartitionKey(value = 0)
+    @Column(name = ModelConstants.ID_PROPERTY)
+    private UUID id;
+    
+    @Column(name = ModelConstants.DEVICE_CREDENTIALS_DEVICE_ID_PROPERTY)
+    private UUID deviceId;
+    
+    @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_TYPE_PROPERTY, codec = DeviceCredentialsTypeCodec.class)
+    private DeviceCredentialsType credentialsType;
+
+    @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_ID_PROPERTY)
+    private String credentialsId;
+
+    @Column(name = ModelConstants.DEVICE_CREDENTIALS_CREDENTIALS_VALUE_PROPERTY)
+    private String credentialsValue;
+
+    public DeviceCredentialsEntity() {
+        super();
+    }
+
+    public DeviceCredentialsEntity(DeviceCredentials deviceCredentials) {
+        if (deviceCredentials.getId() != null) {
+            this.id = deviceCredentials.getId().getId();
+        }
+        if (deviceCredentials.getDeviceId() != null) {
+            this.deviceId = deviceCredentials.getDeviceId().getId();
+        }
+        this.credentialsType = deviceCredentials.getCredentialsType();
+        this.credentialsId = deviceCredentials.getCredentialsId();
+        this.credentialsValue = deviceCredentials.getCredentialsValue(); 
+    }
+    
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(UUID deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public DeviceCredentialsType getCredentialsType() {
+        return credentialsType;
+    }
+
+    public void setCredentialsType(DeviceCredentialsType credentialsType) {
+        this.credentialsType = credentialsType;
+    }
+
+    public String getCredentialsId() {
+        return credentialsId;
+    }
+
+    public void setCredentialsId(String credentialsId) {
+        this.credentialsId = credentialsId;
+    }
+
+    public String getCredentialsValue() {
+        return credentialsValue;
+    }
+
+    public void setCredentialsValue(String credentialsValue) {
+        this.credentialsValue = credentialsValue;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((credentialsId == null) ? 0 : credentialsId.hashCode());
+        result = prime * result + ((credentialsType == null) ? 0 : credentialsType.hashCode());
+        result = prime * result + ((credentialsValue == null) ? 0 : credentialsValue.hashCode());
+        result = prime * result + ((deviceId == null) ? 0 : deviceId.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        DeviceCredentialsEntity other = (DeviceCredentialsEntity) obj;
+        if (credentialsId == null) {
+            if (other.credentialsId != null)
+                return false;
+        } else if (!credentialsId.equals(other.credentialsId))
+            return false;
+        if (credentialsType != other.credentialsType)
+            return false;
+        if (credentialsValue == null) {
+            if (other.credentialsValue != null)
+                return false;
+        } else if (!credentialsValue.equals(other.credentialsValue))
+            return false;
+        if (deviceId == null) {
+            if (other.deviceId != null)
+                return false;
+        } else if (!deviceId.equals(other.deviceId))
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("DeviceCredentialsEntity [id=");
+        builder.append(id);
+        builder.append(", deviceId=");
+        builder.append(deviceId);
+        builder.append(", credentialsType=");
+        builder.append(credentialsType);
+        builder.append(", credentialsId=");
+        builder.append(credentialsId);
+        builder.append(", credentialsValue=");
+        builder.append(credentialsValue);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public DeviceCredentials toData() {
+        DeviceCredentials deviceCredentials = new DeviceCredentials(new DeviceCredentialsId(id));
+        deviceCredentials.setCreatedTime(UUIDs.unixTimestamp(id));
+        if (deviceId != null) {
+            deviceCredentials.setDeviceId(new DeviceId(deviceId));
+        }
+        deviceCredentials.setCredentialsType(credentialsType);
+        deviceCredentials.setCredentialsId(credentialsId);
+        deviceCredentials.setCredentialsValue(credentialsValue);
+        return deviceCredentials;
+    }
+
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/DeviceEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/DeviceEntity.java
new file mode 100644
index 0000000..4fc1ea2
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/DeviceEntity.java
@@ -0,0 +1,214 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import java.util.UUID;
+
+import static org.thingsboard.server.dao.model.ModelConstants.*;
+
+@Table(name = DEVICE_COLUMN_FAMILY_NAME)
+public final class DeviceEntity implements SearchTextEntity<Device> {
+
+    @Transient
+    private static final long serialVersionUID = -1265181166886910152L;
+    
+    @PartitionKey(value = 0)
+    @Column(name = ID_PROPERTY)
+    private UUID id;
+    
+    @PartitionKey(value = 1)
+    @Column(name = DEVICE_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+
+    @PartitionKey(value = 2)
+    @Column(name = DEVICE_CUSTOMER_ID_PROPERTY)
+    private UUID customerId;
+
+    @Column(name = DEVICE_NAME_PROPERTY)
+    private String name;
+    
+    @Column(name = SEARCH_TEXT_PROPERTY)
+    private String searchText;
+    
+    @Column(name = DEVICE_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
+    private JsonNode additionalInfo;
+
+    public DeviceEntity() {
+        super();
+    }
+
+    public DeviceEntity(Device device) {
+        if (device.getId() != null) {
+            this.id = device.getId().getId();
+        }
+        if (device.getTenantId() != null) {
+            this.tenantId = device.getTenantId().getId();
+        }
+        if (device.getCustomerId() != null) {
+            this.customerId = device.getCustomerId().getId();
+        }
+        this.name = device.getName();
+        this.additionalInfo = device.getAdditionalInfo();
+    }
+    
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(UUID tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public UUID getCustomerId() {
+        return customerId;
+    }
+
+    public void setCustomerId(UUID customerId) {
+        this.customerId = customerId;
+    }
+    
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public JsonNode getAdditionalInfo() {
+        return additionalInfo;
+    }
+
+    public void setAdditionalInfo(JsonNode additionalInfo) {
+        this.additionalInfo = additionalInfo;
+    }
+    
+    @Override
+    public String getSearchTextSource() {
+        return name;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+    
+    public String getSearchText() {
+        return searchText;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode());
+        result = prime * result + ((customerId == null) ? 0 : customerId.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((name == null) ? 0 : name.hashCode());
+        result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        DeviceEntity other = (DeviceEntity) obj;
+        if (additionalInfo == null) {
+            if (other.additionalInfo != null)
+                return false;
+        } else if (!additionalInfo.equals(other.additionalInfo))
+            return false;
+        if (customerId == null) {
+            if (other.customerId != null)
+                return false;
+        } else if (!customerId.equals(other.customerId))
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (name == null) {
+            if (other.name != null)
+                return false;
+        } else if (!name.equals(other.name))
+            return false;
+        if (tenantId == null) {
+            if (other.tenantId != null)
+                return false;
+        } else if (!tenantId.equals(other.tenantId))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("DeviceEntity [id=");
+        builder.append(id);
+        builder.append(", tenantId=");
+        builder.append(tenantId);
+        builder.append(", customerId=");
+        builder.append(customerId);
+        builder.append(", name=");
+        builder.append(name);
+        builder.append(", additionalInfo=");
+        builder.append(additionalInfo);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public Device toData() {
+        Device device = new Device(new DeviceId(id));
+        device.setCreatedTime(UUIDs.unixTimestamp(id));
+        if (tenantId != null) {
+            device.setTenantId(new TenantId(tenantId));
+        }
+        if (customerId != null) {
+            device.setCustomerId(new CustomerId(customerId));
+        }
+        device.setName(name);
+        device.setAdditionalInfo(additionalInfo);
+        return device;
+    }
+
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/EventEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/EventEntity.java
new file mode 100644
index 0000000..a655daf
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/EventEntity.java
@@ -0,0 +1,123 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.*;
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.data.id.*;
+import org.thingsboard.server.dao.model.type.EntityTypeCodec;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import java.util.UUID;
+
+import static org.thingsboard.server.dao.model.ModelConstants.*;
+
+/**
+ * @author Andrew Shvayka
+ */
+@Data
+@NoArgsConstructor
+@Table(name = DEVICE_COLUMN_FAMILY_NAME)
+public class EventEntity implements BaseEntity<Event> {
+
+    @Transient
+    private static final long serialVersionUID = -1265181166886910153L;
+
+    @Column(name = ID_PROPERTY)
+    private UUID id;
+
+    @PartitionKey()
+    @Column(name = EVENT_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+
+    @PartitionKey(value = 1)
+    @Column(name = EVENT_ENTITY_TYPE_PROPERTY, codec = EntityTypeCodec.class)
+    private EntityType entityType;
+
+    @PartitionKey(value = 2)
+    @Column(name = EVENT_ENTITY_ID_PROPERTY)
+    private UUID entityId;
+
+    @ClusteringColumn()
+    @Column(name = EVENT_TYPE_PROPERTY)
+    private String eventType;
+
+    @ClusteringColumn(value = 1)
+    @Column(name = EVENT_UID_PROPERTY)
+    private String eventUId;
+
+    @Column(name = EVENT_BODY_PROPERTY, codec = JsonCodec.class)
+    private JsonNode body;
+
+    public EventEntity(Event event) {
+        if (event.getId() != null) {
+            this.id = event.getId().getId();
+        }
+        if (event.getTenantId() != null) {
+            this.tenantId = event.getTenantId().getId();
+        }
+        if (event.getEntityId() != null) {
+            this.entityType = event.getEntityId().getEntityType();
+            this.entityId = event.getEntityId().getId();
+        }
+        this.eventType = event.getType();
+        this.eventUId = event.getUid();
+        this.body = event.getBody();
+    }
+
+    @Override
+    public UUID getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    @Override
+    public Event toData() {
+        Event event = new Event(new EventId(id));
+        event.setCreatedTime(UUIDs.unixTimestamp(id));
+        event.setTenantId(new TenantId(tenantId));
+        switch (entityType) {
+            case TENANT:
+                event.setEntityId(new TenantId(entityId));
+                break;
+            case DEVICE:
+                event.setEntityId(new DeviceId(entityId));
+                break;
+            case CUSTOMER:
+                event.setEntityId(new CustomerId(entityId));
+                break;
+            case RULE:
+                event.setEntityId(new RuleId(entityId));
+                break;
+            case PLUGIN:
+                event.setEntityId(new PluginId(entityId));
+                break;
+        }
+        event.setBody(body);
+        event.setType(eventType);
+        event.setUid(eventUId);
+        return event;
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
new file mode 100644
index 0000000..b14e99f
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java
@@ -0,0 +1,262 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import java.util.UUID;
+
+import com.datastax.driver.core.utils.UUIDs;
+
+public class ModelConstants {
+
+    private ModelConstants() {
+    }
+    
+    public static UUID NULL_UUID = UUIDs.startOf(0);
+    
+    /**
+     * Generic constants.
+     */
+    public static final String ID_PROPERTY = "id";
+    public static final String USER_ID_PROPERTY = "user_id";
+    public static final String TENTANT_ID_PROPERTY = "tenant_id";
+    public static final String CUSTOMER_ID_PROPERTY = "customer_id";
+    public static final String DEVICE_ID_PROPERTY = "device_id";
+    public static final String TITLE_PROPERTY = "title";
+    public static final String ALIAS_PROPERTY = "alias";
+    public static final String SEARCH_TEXT_PROPERTY = "search_text";
+    public static final String ADDITIONAL_INFO_PROPERTY = "additional_info";
+    
+    /**
+     * Cassandra user constants.
+     */
+    public static final String USER_COLUMN_FAMILY_NAME = "user";
+    public static final String USER_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String USER_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY;
+    public static final String USER_EMAIL_PROPERTY = "email";
+    public static final String USER_AUTHORITY_PROPERTY = "authority";
+    public static final String USER_FIRST_NAME_PROPERTY = "first_name";
+    public static final String USER_LAST_NAME_PROPERTY = "last_name";
+    public static final String USER_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
+    
+    public static final String USER_BY_EMAIL_COLUMN_FAMILY_NAME = "user_by_email";
+    public static final String USER_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "user_by_tenant_and_search_text";
+    public static final String USER_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "user_by_customer_and_search_text";
+    
+    /**
+     * Cassandra user_credentials constants.
+     */
+    public static final String USER_CREDENTIALS_COLUMN_FAMILY_NAME = "user_credentials";
+    public static final String USER_CREDENTIALS_USER_ID_PROPERTY = USER_ID_PROPERTY;
+    public static final String USER_CREDENTIALS_ENABLED_PROPERTY = "enabled";
+    public static final String USER_CREDENTIALS_PASSWORD_PROPERTY = "password";
+    public static final String USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY = "activate_token";
+    public static final String USER_CREDENTIALS_RESET_TOKEN_PROPERTY = "reset_token";
+    
+    public static final String USER_CREDENTIALS_BY_USER_COLUMN_FAMILY_NAME = "user_credentials_by_user";
+    public static final String USER_CREDENTIALS_BY_ACTIVATE_TOKEN_COLUMN_FAMILY_NAME = "user_credentials_by_activate_token";
+    public static final String USER_CREDENTIALS_BY_RESET_TOKEN_COLUMN_FAMILY_NAME = "user_credentials_by_reset_token";
+    
+    /**
+     * Cassandra admin_settings constants.
+     */
+    public static final String ADMIN_SETTINGS_COLUMN_FAMILY_NAME = "admin_settings";
+    public static final String ADMIN_SETTINGS_KEY_PROPERTY = "key";
+    public static final String ADMIN_SETTINGS_JSON_VALUE_PROPERTY = "json_value";
+    
+    public static final String ADMIN_SETTINGS_BY_KEY_COLUMN_FAMILY_NAME = "admin_settings_by_key";
+    
+    /**
+     * Cassandra contact constants.
+     */
+    public static final String COUNTRY_PROPERTY = "country";
+    public static final String STATE_PROPERTY = "state";
+    public static final String CITY_PROPERTY = "city";
+    public static final String ADDRESS_PROPERTY = "address";
+    public static final String ADDRESS2_PROPERTY = "address2";
+    public static final String ZIP_PROPERTY = "zip";
+    public static final String PHONE_PROPERTY = "phone";
+    public static final String EMAIL_PROPERTY = "email";
+
+    /**
+     * Cassandra tenant constants.
+     */
+    public static final String TENANT_COLUMN_FAMILY_NAME = "tenant";
+    public static final String TENANT_TITLE_PROPERTY = TITLE_PROPERTY;
+    public static final String TENANT_REGION_PROPERTY = "region";
+    public static final String TENANT_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
+    
+    public static final String TENANT_BY_REGION_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "tenant_by_region_and_search_text";
+    
+    /**
+     * Cassandra customer constants.
+     */
+    public static final String CUSTOMER_COLUMN_FAMILY_NAME = "customer";
+    public static final String CUSTOMER_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String CUSTOMER_TITLE_PROPERTY = TITLE_PROPERTY;
+    public static final String CUSTOMER_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
+    
+    public static final String CUSTOMER_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "customer_by_tenant_and_search_text";
+    
+    /**
+     * Cassandra device constants.
+     */
+    public static final String DEVICE_COLUMN_FAMILY_NAME = "device";
+    public static final String DEVICE_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String DEVICE_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY;
+    public static final String DEVICE_NAME_PROPERTY = "name";
+    public static final String DEVICE_ADDITIONAL_INFO_PROPERTY = ADDITIONAL_INFO_PROPERTY;
+    
+    public static final String DEVICE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "device_by_tenant_and_search_text";
+    public static final String DEVICE_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "device_by_customer_and_search_text";
+    public static final String DEVICE_BY_TENANT_AND_NAME_VIEW_NAME = "device_by_tenant_and_name";
+
+    
+    /**
+     * Cassandra device_credentials constants.
+     */
+    public static final String DEVICE_CREDENTIALS_COLUMN_FAMILY_NAME = "device_credentials";
+    public static final String DEVICE_CREDENTIALS_DEVICE_ID_PROPERTY = DEVICE_ID_PROPERTY;
+    public static final String DEVICE_CREDENTIALS_CREDENTIALS_TYPE_PROPERTY = "credentials_type";
+    public static final String DEVICE_CREDENTIALS_CREDENTIALS_ID_PROPERTY = "credentials_id";
+    public static final String DEVICE_CREDENTIALS_CREDENTIALS_VALUE_PROPERTY = "credentials_value";
+    
+    public static final String DEVICE_CREDENTIALS_BY_DEVICE_COLUMN_FAMILY_NAME = "device_credentials_by_device";
+    public static final String DEVICE_CREDENTIALS_BY_CREDENTIALS_ID_COLUMN_FAMILY_NAME = "device_credentials_by_credentials_id";
+
+    /**
+     * Cassandra widgets_bundle constants.
+     */
+    public static final String WIDGETS_BUNDLE_COLUMN_FAMILY_NAME = "widgets_bundle";
+    public static final String WIDGETS_BUNDLE_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String WIDGETS_BUNDLE_ALIAS_PROPERTY = ALIAS_PROPERTY;
+    public static final String WIDGETS_BUNDLE_TITLE_PROPERTY = TITLE_PROPERTY;
+    public static final String WIDGETS_BUNDLE_IMAGE_PROPERTY = "image";
+
+    public static final String WIDGETS_BUNDLE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "widgets_bundle_by_tenant_and_search_text";
+    public static final String WIDGETS_BUNDLE_BY_TENANT_AND_ALIAS_COLUMN_FAMILY_NAME = "widgets_bundle_by_tenant_and_alias";
+
+    /**
+     * Cassandra widget_type constants.
+     */
+    public static final String WIDGET_TYPE_COLUMN_FAMILY_NAME = "widget_type";
+    public static final String WIDGET_TYPE_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY = "bundle_alias";
+    public static final String WIDGET_TYPE_ALIAS_PROPERTY = ALIAS_PROPERTY;
+    public static final String WIDGET_TYPE_NAME_PROPERTY = "name";
+    public static final String WIDGET_TYPE_DESCRIPTOR_PROPERTY = "descriptor";
+
+    public static final String WIDGET_TYPE_BY_TENANT_AND_ALIASES_COLUMN_FAMILY_NAME = "widget_type_by_tenant_and_aliases";
+
+    /**
+     * Cassandra dashboard constants.
+     */
+    public static final String DASHBOARD_COLUMN_FAMILY_NAME = "dashboard";
+    public static final String DASHBOARD_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String DASHBOARD_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY;
+    public static final String DASHBOARD_TITLE_PROPERTY = TITLE_PROPERTY;
+    public static final String DASHBOARD_CONFIGURATION_PROPERTY = "configuration";
+
+    public static final String DASHBOARD_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "dashboard_by_tenant_and_search_text";
+    public static final String DASHBOARD_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "dashboard_by_customer_and_search_text";
+
+
+    /**
+     * Cassandra plugin metadata constants.
+     */
+    public static final String PLUGIN_COLUMN_FAMILY_NAME = "plugin";
+    public static final String PLUGIN_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String PLUGIN_NAME_PROPERTY = "name";
+    public static final String PLUGIN_API_TOKEN_PROPERTY = "api_token";
+    public static final String PLUGIN_CLASS_PROPERTY = "plugin_class";
+    public static final String PLUGIN_ACCESS_PROPERTY = "public_access";
+    public static final String PLUGIN_STATE_PROPERTY = "state";
+    public static final String PLUGIN_CONFIGURATION_PROPERTY = "configuration";
+
+    public static final String PLUGIN_BY_API_TOKEN_COLUMN_FAMILY_NAME = "plugin_by_api_token";
+    public static final String PLUGIN_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "plugin_by_tenant_and_search_text";
+
+    /**
+     * Cassandra plugin component metadata constants.
+     */
+    public static final String COMPONENT_DESCRIPTOR_COLUMN_FAMILY_NAME = "component_descriptor";
+    public static final String COMPONENT_DESCRIPTOR_TYPE_PROPERTY = "type";
+    public static final String COMPONENT_DESCRIPTOR_SCOPE_PROPERTY = "scope";
+    public static final String COMPONENT_DESCRIPTOR_NAME_PROPERTY = "name";
+    public static final String COMPONENT_DESCRIPTOR_CLASS_PROPERTY = "clazz";
+    public static final String COMPONENT_DESCRIPTOR_CONFIGURATION_DESCRIPTOR_PROPERTY = "configuration_descriptor";
+    public static final String COMPONENT_DESCRIPTOR_ACTIONS_PROPERTY = "actions";
+
+    public static final String COMPONENT_DESCRIPTOR_BY_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "component_desc_by_type_search_text";
+    public static final String COMPONENT_DESCRIPTOR_BY_SCOPE_TYPE_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "component_desc_by_scope_type_search_text";
+    public static final String COMPONENT_DESCRIPTOR_BY_ID = "component_desc_by_id";
+
+  /**
+   * Cassandra rule metadata constants.
+   */
+    public static final String RULE_COLUMN_FAMILY_NAME = "rule";
+    public static final String RULE_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String RULE_NAME_PROPERTY = "name";
+    public static final String RULE_STATE_PROPERTY = "state";
+    public static final String RULE_WEIGHT_PROPERTY = "weight";
+    public static final String RULE_PLUGIN_TOKEN_PROPERTY = "plugin_token";
+    public static final String RULE_FILTERS = "filters";
+    public static final String RULE_PROCESSOR = "processor";
+    public static final String RULE_ACTION = "action";
+
+    public static final String RULE_BY_PLUGIN_TOKEN = "rule_by_plugin_token";
+    public static final String RULE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME = "rule_by_tenant_and_search_text";
+
+    /**
+     * Cassandra event constants.
+     */
+    public static final String EVENT_COLUMN_FAMILY_NAME = "event";
+    public static final String EVENT_TENANT_ID_PROPERTY = TENTANT_ID_PROPERTY;
+    public static final String EVENT_TYPE_PROPERTY = "event_type";
+    public static final String EVENT_UID_PROPERTY = "event_uid";
+    public static final String EVENT_ENTITY_TYPE_PROPERTY = "entity_type";
+    public static final String EVENT_ENTITY_ID_PROPERTY = "entity_id";
+    public static final String EVENT_BODY_PROPERTY = "body";
+
+    public static final String EVENT_BY_TYPE_AND_ID_VIEW_NAME = "event_by_type_and_id";
+    public static final String EVENT_BY_ID_VIEW_NAME = "event_by_id";
+
+    /**
+     * Cassandra attributes and timeseries constants.
+     */
+    public static final String ATTRIBUTES_KV_CF = "attributes_kv_cf";
+    public static final String TS_KV_CF = "ts_kv_cf";
+    public static final String TS_KV_PARTITIONS_CF = "ts_kv_partitions_cf";
+    public static final String TS_KV_LATEST_CF = "ts_kv_latest_cf";
+
+
+    public static final String ENTITY_TYPE_COLUMN = "entity_type";
+    public static final String ENTITY_ID_COLUMN = "entity_id";
+    public static final String ATTRIBUTE_TYPE_COLUMN = "attribute_type";
+    public static final String ATTRIBUTE_KEY_COLUMN = "attribute_key";
+    public static final String LAST_UPDATE_TS_COLUMN = "last_update_ts";
+
+    public static final String PARTITION_COLUMN = "partition";
+    public static final String KEY_COLUMN = "key";
+    public static final String TS_COLUMN = "ts";
+
+    /**
+     * Main names of cassandra key-value columns storage.
+     */
+    public static final String BOOLEAN_VALUE_COLUMN = "bool_v";
+    public static final String STRING_VALUE_COLUMN = "str_v";
+    public static final String LONG_VALUE_COLUMN = "long_v";
+    public static final String DOUBLE_VALUE_COLUMN = "dbl_v";
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/PluginMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/PluginMetaDataEntity.java
new file mode 100644
index 0000000..c36bc28
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/PluginMetaDataEntity.java
@@ -0,0 +1,218 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.id.PluginId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.dao.model.type.ComponentLifecycleStateCodec;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import java.util.Objects;
+import java.util.UUID;
+
+import static org.thingsboard.server.dao.model.ModelConstants.ADDITIONAL_INFO_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.RULE_ACTION;
+
+@Table(name = ModelConstants.PLUGIN_COLUMN_FAMILY_NAME)
+public class PluginMetaDataEntity implements SearchTextEntity<PluginMetaData> {
+
+    private static final long serialVersionUID = 1L;
+
+    @PartitionKey
+    @Column(name = ModelConstants.ID_PROPERTY)
+    private UUID id;
+
+    @Column(name = ModelConstants.PLUGIN_API_TOKEN_PROPERTY)
+    private String apiToken;
+
+    @ClusteringColumn
+    @Column(name = ModelConstants.PLUGIN_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+
+    @Column(name = ModelConstants.PLUGIN_NAME_PROPERTY)
+    private String name;
+
+    @Column(name = ModelConstants.PLUGIN_CLASS_PROPERTY)
+    private String clazz;
+
+    @Column(name = ModelConstants.PLUGIN_ACCESS_PROPERTY)
+    private boolean publicAccess;
+
+    @Column(name = ModelConstants.PLUGIN_STATE_PROPERTY, codec = ComponentLifecycleStateCodec.class)
+    private ComponentLifecycleState state;
+
+    @Column(name = ModelConstants.PLUGIN_CONFIGURATION_PROPERTY, codec = JsonCodec.class)
+    private JsonNode configuration;
+
+    @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY)
+    private String searchText;
+
+    @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
+    private JsonNode additionalInfo;
+
+    public PluginMetaDataEntity() {
+    }
+
+    public PluginMetaDataEntity(PluginMetaData pluginMetaData) {
+        if (pluginMetaData.getId() != null) {
+            this.id = pluginMetaData.getId().getId();
+        }
+        this.tenantId = pluginMetaData.getTenantId().getId();
+        this.apiToken = pluginMetaData.getApiToken();
+        this.clazz = pluginMetaData.getClazz();
+        this.name = pluginMetaData.getName();
+        this.publicAccess = pluginMetaData.isPublicAccess();
+        this.state = pluginMetaData.getState();
+        this.configuration = pluginMetaData.getConfiguration();
+        this.searchText = pluginMetaData.getName();
+        this.additionalInfo = pluginMetaData.getAdditionalInfo();
+    }
+
+    @Override
+    public String getSearchTextSource() {
+        return searchText;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+
+    @Override
+    public UUID getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getApiToken() {
+        return apiToken;
+    }
+
+    public void setApiToken(String apiToken) {
+        this.apiToken = apiToken;
+    }
+
+    public UUID getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(UUID tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getClazz() {
+        return clazz;
+    }
+
+    public void setClazz(String clazz) {
+        this.clazz = clazz;
+    }
+
+    public JsonNode getConfiguration() {
+        return configuration;
+    }
+
+    public void setConfiguration(JsonNode configuration) {
+        this.configuration = configuration;
+    }
+
+    public boolean isPublicAccess() {
+        return publicAccess;
+    }
+
+    public void setPublicAccess(boolean publicAccess) {
+        this.publicAccess = publicAccess;
+    }
+
+    public ComponentLifecycleState getState() {
+        return state;
+    }
+
+    public void setState(ComponentLifecycleState state) {
+        this.state = state;
+    }
+
+    public String getSearchText() {
+        return searchText;
+    }
+
+    public JsonNode getAdditionalInfo() {
+        return additionalInfo;
+    }
+
+    public void setAdditionalInfo(JsonNode additionalInfo) {
+        this.additionalInfo = additionalInfo;
+    }
+
+    @Override
+    public PluginMetaData toData() {
+        PluginMetaData data = new PluginMetaData(new PluginId(id));
+        data.setTenantId(new TenantId(tenantId));
+        data.setCreatedTime(UUIDs.unixTimestamp(id));
+        data.setName(name);
+        data.setConfiguration(configuration);
+        data.setClazz(clazz);
+        data.setPublicAccess(publicAccess);
+        data.setState(state);
+        data.setApiToken(apiToken);
+        data.setAdditionalInfo(additionalInfo);
+        return data;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        PluginMetaDataEntity entity = (PluginMetaDataEntity) o;
+        return Objects.equals(id, entity.id) && Objects.equals(apiToken, entity.apiToken) && Objects.equals(tenantId, entity.tenantId)
+                && Objects.equals(name, entity.name) && Objects.equals(clazz, entity.clazz) && Objects.equals(state, entity.state)
+                && Objects.equals(configuration, entity.configuration)
+                && Objects.equals(searchText, entity.searchText);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, apiToken, tenantId, name, clazz, state, configuration, searchText);
+    }
+
+    @Override
+    public String toString() {
+        return "PluginMetaDataEntity{" + "id=" + id + ", apiToken='" + apiToken + '\'' + ", tenantId=" + tenantId + ", name='" + name + '\'' + ", clazz='"
+                + clazz + '\'' + ", state=" + state + ", configuration=" + configuration + ", searchText='" + searchText + '\'' + '}';
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/RuleMetaDataEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/RuleMetaDataEntity.java
new file mode 100644
index 0000000..dd2c55e
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/RuleMetaDataEntity.java
@@ -0,0 +1,227 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.ClusteringColumn;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.id.RuleId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.dao.DaoUtil;
+import org.thingsboard.server.dao.model.type.ComponentLifecycleStateCodec;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import java.util.Objects;
+import java.util.UUID;
+
+import static org.thingsboard.server.dao.model.ModelConstants.*;
+
+@Table(name = RULE_COLUMN_FAMILY_NAME)
+public class RuleMetaDataEntity implements SearchTextEntity<RuleMetaData> {
+
+    @PartitionKey
+    @Column(name = ID_PROPERTY)
+    private UUID id;
+    @ClusteringColumn
+    @Column(name = RULE_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+    @Column(name = RULE_NAME_PROPERTY)
+    private String name;
+    @Column(name = ModelConstants.RULE_STATE_PROPERTY, codec = ComponentLifecycleStateCodec.class)
+    private ComponentLifecycleState state;
+    @Column(name = RULE_WEIGHT_PROPERTY)
+    private int weight;
+    @Column(name = SEARCH_TEXT_PROPERTY)
+    private String searchText;
+    @Column(name = RULE_PLUGIN_TOKEN_PROPERTY)
+    private String pluginToken;
+    @Column(name = RULE_FILTERS, codec = JsonCodec.class)
+    private JsonNode filters;
+    @Column(name = RULE_PROCESSOR, codec = JsonCodec.class)
+    private JsonNode processor;
+    @Column(name = RULE_ACTION, codec = JsonCodec.class)
+    private JsonNode action;
+    @Column(name = ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
+    private JsonNode additionalInfo;
+
+    public RuleMetaDataEntity() {
+    }
+
+    public RuleMetaDataEntity(RuleMetaData rule) {
+        if (rule.getId() != null) {
+            this.id = rule.getUuidId();
+        }
+        this.tenantId = DaoUtil.getId(rule.getTenantId());
+        this.name = rule.getName();
+        this.pluginToken = rule.getPluginToken();
+        this.state = rule.getState();
+        this.weight = rule.getWeight();
+        this.searchText = rule.getName();
+        this.filters = rule.getFilters();
+        this.processor = rule.getProcessor();
+        this.action = rule.getAction();
+        this.additionalInfo = rule.getAdditionalInfo();
+    }
+
+    @Override
+    public String getSearchTextSource() {
+        return searchText;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+
+    @Override
+    public UUID getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(UUID tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public ComponentLifecycleState getState() {
+        return state;
+    }
+
+    public void setState(ComponentLifecycleState state) {
+        this.state = state;
+    }
+
+    public int getWeight() {
+        return weight;
+    }
+
+    public void setWeight(int weight) {
+        this.weight = weight;
+    }
+
+    public String getPluginToken() {
+        return pluginToken;
+    }
+
+    public void setPluginToken(String pluginToken) {
+        this.pluginToken = pluginToken;
+    }
+
+    public String getSearchText() {
+        return searchText;
+    }
+
+    public JsonNode getFilters() {
+        return filters;
+    }
+
+    public void setFilters(JsonNode filters) {
+        this.filters = filters;
+    }
+
+    public JsonNode getProcessor() {
+        return processor;
+    }
+
+    public void setProcessor(JsonNode processor) {
+        this.processor = processor;
+    }
+
+    public JsonNode getAction() {
+        return action;
+    }
+
+    public void setAction(JsonNode action) {
+        this.action = action;
+    }
+
+    public JsonNode getAdditionalInfo() {
+        return additionalInfo;
+    }
+
+    public void setAdditionalInfo(JsonNode additionalInfo) {
+        this.additionalInfo = additionalInfo;
+    }
+
+    @Override
+    public RuleMetaData toData() {
+        RuleMetaData rule = new RuleMetaData(new RuleId(id));
+        rule.setTenantId(new TenantId(tenantId));
+        rule.setName(name);
+        rule.setState(state);
+        rule.setWeight(weight);
+        rule.setCreatedTime(UUIDs.unixTimestamp(id));
+        rule.setPluginToken(pluginToken);
+        rule.setFilters(filters);
+        rule.setProcessor(processor);
+        rule.setAction(action);
+        rule.setAdditionalInfo(additionalInfo);
+        return rule;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        RuleMetaDataEntity that = (RuleMetaDataEntity) o;
+        return weight == that.weight &&
+                Objects.equals(id, that.id) &&
+                Objects.equals(tenantId, that.tenantId) &&
+                Objects.equals(name, that.name) &&
+                Objects.equals(pluginToken, that.pluginToken) &&
+                Objects.equals(state, that.state) &&
+                Objects.equals(searchText, that.searchText);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, tenantId, name, pluginToken, state, weight, searchText);
+    }
+
+    @Override
+    public String toString() {
+        return "RuleMetaDataEntity{" +
+                "id=" + id +
+                ", tenantId=" + tenantId +
+                ", name='" + name + '\'' +
+                ", pluginToken='" + pluginToken + '\'' +
+                ", state='" + state + '\'' +
+                ", weight=" + weight +
+                ", searchText='" + searchText + '\'' +
+                '}';
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/SearchTextEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/SearchTextEntity.java
new file mode 100644
index 0000000..9233dd3
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/SearchTextEntity.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+public interface SearchTextEntity<D> extends BaseEntity<D> {
+
+    String getSearchTextSource();
+    
+    void setSearchText(String searchText);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/TenantEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/TenantEntity.java
new file mode 100644
index 0000000..7069cca
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/TenantEntity.java
@@ -0,0 +1,364 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import static org.thingsboard.server.dao.model.ModelConstants.ADDRESS2_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ADDRESS_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.CITY_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.COUNTRY_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.EMAIL_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.PHONE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.STATE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.TENANT_ADDITIONAL_INFO_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.TENANT_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.TENANT_REGION_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.TENANT_TITLE_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.ZIP_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import com.fasterxml.jackson.databind.JsonNode;
+
+@Table(name = TENANT_COLUMN_FAMILY_NAME)
+public final class TenantEntity implements SearchTextEntity<Tenant> {
+
+    @Transient
+    private static final long serialVersionUID = -6198635547142409206L;
+    
+    @PartitionKey(value = 0)
+    @Column(name = ID_PROPERTY)
+    private UUID id;
+
+    @Column(name = TENANT_TITLE_PROPERTY)
+    private String title;
+    
+    @Column(name = SEARCH_TEXT_PROPERTY)
+    private String searchText;
+
+    @Column(name = TENANT_REGION_PROPERTY)
+    private String region;
+    
+    @Column(name = COUNTRY_PROPERTY)
+    private String country;
+    
+    @Column(name = STATE_PROPERTY)
+    private String state;
+
+    @Column(name = CITY_PROPERTY)
+    private String city;
+
+    @Column(name = ADDRESS_PROPERTY)
+    private String address;
+
+    @Column(name = ADDRESS2_PROPERTY)
+    private String address2;
+
+    @Column(name = ZIP_PROPERTY)
+    private String zip;
+
+    @Column(name = PHONE_PROPERTY)
+    private String phone;
+
+    @Column(name = EMAIL_PROPERTY)
+    private String email;
+
+    @Column(name = TENANT_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
+    private JsonNode additionalInfo;
+
+    public TenantEntity() {
+        super();
+    }
+
+    public TenantEntity(Tenant tenant) {
+        if (tenant.getId() != null) {
+            this.id = tenant.getId().getId();
+        }
+        this.title = tenant.getTitle();
+        this.region = tenant.getRegion();
+        this.country = tenant.getCountry();
+        this.state = tenant.getState();
+        this.city = tenant.getCity();
+        this.address = tenant.getAddress();
+        this.address2 = tenant.getAddress2();
+        this.zip = tenant.getZip();
+        this.phone = tenant.getPhone();
+        this.email = tenant.getEmail();
+        this.additionalInfo = tenant.getAdditionalInfo();
+    }
+    
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getRegion() {
+        return region;
+    }
+
+    public void setRegion(String region) {
+        this.region = region;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getAddress2() {
+        return address2;
+    }
+
+    public void setAddress2(String address2) {
+        this.address2 = address2;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public JsonNode getAdditionalInfo() {
+        return additionalInfo;
+    }
+
+    public void setAdditionalInfo(JsonNode additionalInfo) {
+        this.additionalInfo = additionalInfo;
+    }
+
+    @Override
+    public String getSearchTextSource() {
+        return title;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+    
+    public String getSearchText() {
+        return searchText;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode());
+        result = prime * result + ((address == null) ? 0 : address.hashCode());
+        result = prime * result + ((address2 == null) ? 0 : address2.hashCode());
+        result = prime * result + ((city == null) ? 0 : city.hashCode());
+        result = prime * result + ((country == null) ? 0 : country.hashCode());
+        result = prime * result + ((email == null) ? 0 : email.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((phone == null) ? 0 : phone.hashCode());
+        result = prime * result + ((region == null) ? 0 : region.hashCode());
+        result = prime * result + ((state == null) ? 0 : state.hashCode());
+        result = prime * result + ((title == null) ? 0 : title.hashCode());
+        result = prime * result + ((zip == null) ? 0 : zip.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        TenantEntity other = (TenantEntity) obj;
+        if (additionalInfo == null) {
+            if (other.additionalInfo != null)
+                return false;
+        } else if (!additionalInfo.equals(other.additionalInfo))
+            return false;
+        if (address == null) {
+            if (other.address != null)
+                return false;
+        } else if (!address.equals(other.address))
+            return false;
+        if (address2 == null) {
+            if (other.address2 != null)
+                return false;
+        } else if (!address2.equals(other.address2))
+            return false;
+        if (city == null) {
+            if (other.city != null)
+                return false;
+        } else if (!city.equals(other.city))
+            return false;
+        if (country == null) {
+            if (other.country != null)
+                return false;
+        } else if (!country.equals(other.country))
+            return false;
+        if (email == null) {
+            if (other.email != null)
+                return false;
+        } else if (!email.equals(other.email))
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (phone == null) {
+            if (other.phone != null)
+                return false;
+        } else if (!phone.equals(other.phone))
+            return false;
+        if (region == null) {
+            if (other.region != null)
+                return false;
+        } else if (!region.equals(other.region))
+            return false;
+        if (state == null) {
+            if (other.state != null)
+                return false;
+        } else if (!state.equals(other.state))
+            return false;
+        if (title == null) {
+            if (other.title != null)
+                return false;
+        } else if (!title.equals(other.title))
+            return false;
+        if (zip == null) {
+            if (other.zip != null)
+                return false;
+        } else if (!zip.equals(other.zip))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("TenantEntity [id=");
+        builder.append(id);
+        builder.append(", title=");
+        builder.append(title);
+        builder.append(", region=");
+        builder.append(region);
+        builder.append(", country=");
+        builder.append(country);
+        builder.append(", state=");
+        builder.append(state);
+        builder.append(", city=");
+        builder.append(city);
+        builder.append(", address=");
+        builder.append(address);
+        builder.append(", address2=");
+        builder.append(address2);
+        builder.append(", zip=");
+        builder.append(zip);
+        builder.append(", phone=");
+        builder.append(phone);
+        builder.append(", email=");
+        builder.append(email);
+        builder.append(", additionalInfo=");
+        builder.append(additionalInfo);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public Tenant toData() {
+        Tenant tenant = new Tenant(new TenantId(id));
+        tenant.setCreatedTime(UUIDs.unixTimestamp(id));
+        tenant.setTitle(title);
+        tenant.setRegion(region);
+        tenant.setCountry(country);
+        tenant.setState(state);
+        tenant.setCity(city);
+        tenant.setAddress(address);
+        tenant.setAddress2(address2);
+        tenant.setZip(zip);
+        tenant.setPhone(phone);
+        tenant.setEmail(email);
+        tenant.setAdditionalInfo(additionalInfo);
+        return tenant;
+    }
+
+
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/ToData.java b/dao/src/main/java/org/thingsboard/server/dao/model/ToData.java
new file mode 100644
index 0000000..53dd9c9
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/ToData.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+/**
+ * The interface To dto.
+ *
+ * @param <T> the type parameter
+ */
+public interface ToData<T> {
+
+    /**
+     * This method convert domain model object to data transfer object.
+     *
+     * @return the dto object
+     */
+    T toData();
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/type/AuthorityCodec.java b/dao/src/main/java/org/thingsboard/server/dao/model/type/AuthorityCodec.java
new file mode 100644
index 0000000..35f708d
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/type/AuthorityCodec.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.type;
+
+import org.thingsboard.server.common.data.security.Authority;
+
+import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
+
+public class AuthorityCodec extends EnumNameCodec<Authority> {
+
+    public AuthorityCodec() {
+        super(Authority.class);
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentLifecycleStateCodec.java b/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentLifecycleStateCodec.java
new file mode 100644
index 0000000..fb6d309
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentLifecycleStateCodec.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.type;
+
+import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
+import org.thingsboard.server.common.data.security.Authority;
+
+public class ComponentLifecycleStateCodec extends EnumNameCodec<ComponentLifecycleState> {
+
+    public ComponentLifecycleStateCodec() {
+        super(ComponentLifecycleState.class);
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentScopeCodec.java b/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentScopeCodec.java
new file mode 100644
index 0000000..7a3d4db
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentScopeCodec.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.type;
+
+import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
+import org.thingsboard.server.common.data.plugin.ComponentScope;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+
+public class ComponentScopeCodec extends EnumNameCodec<ComponentScope> {
+
+    public ComponentScopeCodec() {
+        super(ComponentScope.class);
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentTypeCodec.java b/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentTypeCodec.java
new file mode 100644
index 0000000..9953e8b
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/type/ComponentTypeCodec.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.type;
+
+import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+
+public class ComponentTypeCodec extends EnumNameCodec<ComponentType> {
+
+    public ComponentTypeCodec() {
+        super(ComponentType.class);
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/type/DeviceCredentialsTypeCodec.java b/dao/src/main/java/org/thingsboard/server/dao/model/type/DeviceCredentialsTypeCodec.java
new file mode 100644
index 0000000..25a8a27
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/type/DeviceCredentialsTypeCodec.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.type;
+
+import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+
+import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
+
+public class DeviceCredentialsTypeCodec extends EnumNameCodec<DeviceCredentialsType> {
+
+    public DeviceCredentialsTypeCodec() {
+        super(DeviceCredentialsType.class);
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/type/EntityTypeCodec.java b/dao/src/main/java/org/thingsboard/server/dao/model/type/EntityTypeCodec.java
new file mode 100644
index 0000000..5f19d72
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/type/EntityTypeCodec.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.type;
+
+import com.datastax.driver.extras.codecs.enums.EnumNameCodec;
+import org.thingsboard.server.common.data.EntityType;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+
+public class EntityTypeCodec extends EnumNameCodec<EntityType> {
+
+    public EntityTypeCodec() {
+        super(EntityType.class);
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/type/JsonCodec.java b/dao/src/main/java/org/thingsboard/server/dao/model/type/JsonCodec.java
new file mode 100644
index 0000000..5dc9d10
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/type/JsonCodec.java
@@ -0,0 +1,27 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.type;
+
+import com.datastax.driver.extras.codecs.json.JacksonJsonCodec;
+import com.fasterxml.jackson.databind.JsonNode;
+
+public class JsonCodec extends JacksonJsonCodec<JsonNode> {
+
+    public JsonCodec() {
+        super(JsonNode.class);
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/UserCredentialsEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/UserCredentialsEntity.java
new file mode 100644
index 0000000..ebf914d
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/UserCredentialsEntity.java
@@ -0,0 +1,194 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_PASSWORD_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_ENABLED_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.id.UserCredentialsId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.security.UserCredentials;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+
+@Table(name = USER_CREDENTIALS_COLUMN_FAMILY_NAME)
+public final class UserCredentialsEntity implements BaseEntity<UserCredentials> {
+
+    @Transient
+    private static final long serialVersionUID = 1348221414123438374L;
+    
+    @PartitionKey(value = 0)
+    @Column(name = ID_PROPERTY)
+    private UUID id;
+    
+    @Column(name = USER_CREDENTIALS_USER_ID_PROPERTY)
+    private UUID userId;
+
+    @Column(name = USER_CREDENTIALS_ENABLED_PROPERTY)
+    private boolean enabled;
+
+    @Column(name = USER_CREDENTIALS_PASSWORD_PROPERTY)
+    private String password;
+
+    @Column(name = USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY)
+    private String activateToken;
+
+    @Column(name = USER_CREDENTIALS_RESET_TOKEN_PROPERTY)
+    private String resetToken;
+
+    public UserCredentialsEntity() {
+        super();
+    }
+
+    public UserCredentialsEntity(UserCredentials userCredentials) {
+        if (userCredentials.getId() != null) {
+            this.id = userCredentials.getId().getId();
+        }
+        if (userCredentials.getUserId() != null) {
+            this.userId = userCredentials.getUserId().getId();
+        }
+        this.enabled = userCredentials.isEnabled();
+        this.password = userCredentials.getPassword();
+        this.activateToken = userCredentials.getActivateToken();
+        this.resetToken = userCredentials.getResetToken();
+    }
+    
+    public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getUserId() {
+        return userId;
+    }
+
+    public void setUserId(UUID userId) {
+        this.userId = userId;
+    }
+    
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getActivateToken() {
+        return activateToken;
+    }
+
+    public void setActivateToken(String activateToken) {
+        this.activateToken = activateToken;
+    }
+
+    public String getResetToken() {
+        return resetToken;
+    }
+
+    public void setResetToken(String resetToken) {
+        this.resetToken = resetToken;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((activateToken == null) ? 0 : activateToken.hashCode());
+        result = prime * result + (enabled ? 1231 : 1237);
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((password == null) ? 0 : password.hashCode());
+        result = prime * result + ((resetToken == null) ? 0 : resetToken.hashCode());
+        result = prime * result + ((userId == null) ? 0 : userId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        UserCredentialsEntity other = (UserCredentialsEntity) obj;
+        if (activateToken == null) {
+            if (other.activateToken != null)
+                return false;
+        } else if (!activateToken.equals(other.activateToken))
+            return false;
+        if (enabled != other.enabled)
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (password == null) {
+            if (other.password != null)
+                return false;
+        } else if (!password.equals(other.password))
+            return false;
+        if (resetToken == null) {
+            if (other.resetToken != null)
+                return false;
+        } else if (!resetToken.equals(other.resetToken))
+            return false;
+        if (userId == null) {
+            if (other.userId != null)
+                return false;
+        } else if (!userId.equals(other.userId))
+            return false;
+        return true;
+    }
+
+    @Override
+    public UserCredentials toData() {
+        UserCredentials userCredentials = new UserCredentials(new UserCredentialsId(id));
+        userCredentials.setCreatedTime(UUIDs.unixTimestamp(id));
+        if (userId != null) {
+            userCredentials.setUserId(new UserId(userId));
+        }
+        userCredentials.setEnabled(enabled);
+        userCredentials.setPassword(password);
+        userCredentials.setActivateToken(activateToken);
+        userCredentials.setResetToken(resetToken);
+        return userCredentials;
+    }
+
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/UserEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/UserEntity.java
new file mode 100644
index 0000000..12dec6d
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/UserEntity.java
@@ -0,0 +1,287 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import static org.thingsboard.server.dao.model.ModelConstants.ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.SEARCH_TEXT_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_ADDITIONAL_INFO_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_AUTHORITY_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_CUSTOMER_ID_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_EMAIL_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_FIRST_NAME_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_LAST_NAME_PROPERTY;
+import static org.thingsboard.server.dao.model.ModelConstants.USER_TENANT_ID_PROPERTY;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.model.type.AuthorityCodec;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import com.fasterxml.jackson.databind.JsonNode;
+
+@Table(name = USER_COLUMN_FAMILY_NAME)
+public final class UserEntity implements SearchTextEntity<User> {
+
+	@Transient
+	private static final long serialVersionUID = -7740338274987723489L;
+    
+    @PartitionKey(value = 0)
+    @Column(name = ID_PROPERTY)
+    private UUID id;
+
+    @PartitionKey(value = 1)
+    @Column(name = USER_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+
+    @PartitionKey(value = 2)
+    @Column(name = USER_CUSTOMER_ID_PROPERTY)
+    private UUID customerId;
+
+    @PartitionKey(value = 3)
+    @Column(name = USER_AUTHORITY_PROPERTY, codec = AuthorityCodec.class)
+    private Authority authority;
+
+    @Column(name = USER_EMAIL_PROPERTY)
+    private String email;
+    
+    @Column(name = SEARCH_TEXT_PROPERTY)
+    private String searchText;
+    
+    @Column(name = USER_FIRST_NAME_PROPERTY)
+    private String firstName;
+    
+    @Column(name = USER_LAST_NAME_PROPERTY)
+    private String lastName;
+
+    @Column(name = USER_ADDITIONAL_INFO_PROPERTY, codec = JsonCodec.class)
+    private JsonNode additionalInfo;
+
+    public UserEntity() {
+        super();
+    }
+
+    public UserEntity(User user) {
+        if (user.getId() != null) {
+            this.id = user.getId().getId();
+        }
+        this.authority = user.getAuthority();
+        if (user.getTenantId() != null) {
+        	this.tenantId = user.getTenantId().getId();
+        }
+        if (user.getCustomerId() != null) {
+        	this.customerId = user.getCustomerId().getId();
+        }
+        this.email = user.getEmail();
+        this.firstName = user.getFirstName();
+        this.lastName = user.getLastName();
+        this.additionalInfo = user.getAdditionalInfo();
+    }
+    
+	public UUID getId() {
+        return id;
+    }
+
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public Authority getAuthority() {
+		return authority;
+	}
+
+	public void setAuthority(Authority authority) {
+		this.authority = authority;
+	}
+
+	public UUID getTenantId() {
+		return tenantId;
+	}
+
+	public void setTenantId(UUID tenantId) {
+		this.tenantId = tenantId;
+	}
+
+	public UUID getCustomerId() {
+		return customerId;
+	}
+
+	public void setCustomerId(UUID customerId) {
+		this.customerId = customerId;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public String getFirstName() {
+		return firstName;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public String getLastName() {
+		return lastName;
+	}
+
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+
+	public JsonNode getAdditionalInfo() {
+		return additionalInfo;
+	}
+
+	public void setAdditionalInfo(JsonNode additionalInfo) {
+		this.additionalInfo = additionalInfo;
+	}
+	
+    @Override
+    public String getSearchTextSource() {
+        return email;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+    
+    public String getSearchText() {
+        return searchText;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((additionalInfo == null) ? 0 : additionalInfo.hashCode());
+        result = prime * result + ((authority == null) ? 0 : authority.hashCode());
+        result = prime * result + ((customerId == null) ? 0 : customerId.hashCode());
+        result = prime * result + ((email == null) ? 0 : email.hashCode());
+        result = prime * result + ((firstName == null) ? 0 : firstName.hashCode());
+        result = prime * result + ((id == null) ? 0 : id.hashCode());
+        result = prime * result + ((lastName == null) ? 0 : lastName.hashCode());
+        result = prime * result + ((tenantId == null) ? 0 : tenantId.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        UserEntity other = (UserEntity) obj;
+        if (additionalInfo == null) {
+            if (other.additionalInfo != null)
+                return false;
+        } else if (!additionalInfo.equals(other.additionalInfo))
+            return false;
+        if (authority != other.authority)
+            return false;
+        if (customerId == null) {
+            if (other.customerId != null)
+                return false;
+        } else if (!customerId.equals(other.customerId))
+            return false;
+        if (email == null) {
+            if (other.email != null)
+                return false;
+        } else if (!email.equals(other.email))
+            return false;
+        if (firstName == null) {
+            if (other.firstName != null)
+                return false;
+        } else if (!firstName.equals(other.firstName))
+            return false;
+        if (id == null) {
+            if (other.id != null)
+                return false;
+        } else if (!id.equals(other.id))
+            return false;
+        if (lastName == null) {
+            if (other.lastName != null)
+                return false;
+        } else if (!lastName.equals(other.lastName))
+            return false;
+        if (tenantId == null) {
+            if (other.tenantId != null)
+                return false;
+        } else if (!tenantId.equals(other.tenantId))
+            return false;
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("UserEntity [id=");
+        builder.append(id);
+        builder.append(", authority=");
+        builder.append(authority);
+        builder.append(", tenantId=");
+        builder.append(tenantId);
+        builder.append(", customerId=");
+        builder.append(customerId);
+        builder.append(", email=");
+        builder.append(email);
+        builder.append(", firstName=");
+        builder.append(firstName);
+        builder.append(", lastName=");
+        builder.append(lastName);
+        builder.append(", additionalInfo=");
+        builder.append(additionalInfo);
+        builder.append("]");
+        return builder.toString();
+    }
+
+    @Override
+    public User toData() {
+		User user = new User(new UserId(id));
+		user.setCreatedTime(UUIDs.unixTimestamp(id));
+		user.setAuthority(authority);
+		if (tenantId != null) {
+			user.setTenantId(new TenantId(tenantId));
+		}
+		if (customerId != null) {
+			user.setCustomerId(new CustomerId(customerId));
+		}
+		user.setEmail(email);
+		user.setFirstName(firstName);
+		user.setLastName(lastName);
+		user.setAdditionalInfo(additionalInfo);
+        return user;
+    }
+
+}
\ No newline at end of file

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/WidgetsBundleEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/WidgetsBundleEntity.java
new file mode 100644
index 0000000..60889b6
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/WidgetsBundleEntity.java
@@ -0,0 +1,187 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.WidgetsBundleId;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+
+import java.nio.ByteBuffer;
+import java.util.UUID;
+
+@Table(name = ModelConstants.WIDGETS_BUNDLE_COLUMN_FAMILY_NAME)
+public final class WidgetsBundleEntity implements SearchTextEntity<WidgetsBundle> {
+
+    @Transient
+    private static final long serialVersionUID = -8842195928585650849L;
+
+    @PartitionKey(value = 0)
+    @Column(name = ModelConstants.ID_PROPERTY)
+    private UUID id;
+
+    @PartitionKey(value = 1)
+    @Column(name = ModelConstants.WIDGETS_BUNDLE_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+
+    @Column(name = ModelConstants.WIDGETS_BUNDLE_ALIAS_PROPERTY)
+    private String alias;
+
+    @Column(name = ModelConstants.WIDGETS_BUNDLE_TITLE_PROPERTY)
+    private String title;
+
+    @Column(name = ModelConstants.SEARCH_TEXT_PROPERTY)
+    private String searchText;
+
+    @Column(name = ModelConstants.WIDGETS_BUNDLE_IMAGE_PROPERTY)
+    private ByteBuffer image;
+
+    public WidgetsBundleEntity() {
+        super();
+    }
+
+    public WidgetsBundleEntity(WidgetsBundle widgetsBundle) {
+        if (widgetsBundle.getId() != null) {
+            this.id = widgetsBundle.getId().getId();
+        }
+        if (widgetsBundle.getTenantId() != null) {
+            this.tenantId = widgetsBundle.getTenantId().getId();
+        }
+        this.alias = widgetsBundle.getAlias();
+        this.title = widgetsBundle.getTitle();
+        if (widgetsBundle.getImage() != null) {
+            this.image = ByteBuffer.wrap(widgetsBundle.getImage());
+        }
+    }
+
+    @Override
+    public UUID getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(UUID tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public ByteBuffer getImage() {
+        return image;
+    }
+
+    public void setImage(ByteBuffer image) {
+        this.image = image;
+    }
+
+    @Override
+    public String getSearchTextSource() {
+        return title;
+    }
+
+    @Override
+    public void setSearchText(String searchText) {
+        this.searchText = searchText;
+    }
+
+    public String getSearchText() {
+        return searchText;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (tenantId != null ? tenantId.hashCode() : 0);
+        result = 31 * result + (alias != null ? alias.hashCode() : 0);
+        result = 31 * result + (title != null ? title.hashCode() : 0);
+        result = 31 * result + (searchText != null ? searchText.hashCode() : 0);
+        result = 31 * result + (image != null ? image.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        WidgetsBundleEntity that = (WidgetsBundleEntity) o;
+
+        if (id != null ? !id.equals(that.id) : that.id != null) return false;
+        if (tenantId != null ? !tenantId.equals(that.tenantId) : that.tenantId != null) return false;
+        if (alias != null ? !alias.equals(that.alias) : that.alias != null) return false;
+        if (title != null ? !title.equals(that.title) : that.title != null) return false;
+        if (searchText != null ? !searchText.equals(that.searchText) : that.searchText != null) return false;
+        return image != null ? image.equals(that.image) : that.image == null;
+
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("WidgetsBundleEntity{");
+        sb.append("id=").append(id);
+        sb.append(", tenantId=").append(tenantId);
+        sb.append(", alias='").append(alias).append('\'');
+        sb.append(", title='").append(title).append('\'');
+        sb.append(", searchText='").append(searchText).append('\'');
+        sb.append(", image=").append(image);
+        sb.append('}');
+        return sb.toString();
+    }
+
+    @Override
+    public WidgetsBundle toData() {
+        WidgetsBundle widgetsBundle = new WidgetsBundle(new WidgetsBundleId(id));
+        widgetsBundle.setCreatedTime(UUIDs.unixTimestamp(id));
+        if (tenantId != null) {
+            widgetsBundle.setTenantId(new TenantId(tenantId));
+        }
+        widgetsBundle.setAlias(alias);
+        widgetsBundle.setTitle(title);
+        if (image != null) {
+            byte[] imageByteArray = new byte[image.remaining()];
+            image.get(imageByteArray);
+            widgetsBundle.setImage(imageByteArray);
+        }
+        return widgetsBundle;
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/WidgetTypeEntity.java b/dao/src/main/java/org/thingsboard/server/dao/model/WidgetTypeEntity.java
new file mode 100644
index 0000000..df33948
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/WidgetTypeEntity.java
@@ -0,0 +1,178 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.datastax.driver.mapping.annotations.Column;
+import com.datastax.driver.mapping.annotations.PartitionKey;
+import com.datastax.driver.mapping.annotations.Table;
+import com.datastax.driver.mapping.annotations.Transient;
+import com.fasterxml.jackson.databind.JsonNode;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.WidgetTypeId;
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.dao.model.type.JsonCodec;
+
+import java.util.UUID;
+
+@Table(name = ModelConstants.WIDGET_TYPE_COLUMN_FAMILY_NAME)
+public final class WidgetTypeEntity implements BaseEntity<WidgetType> {
+
+    @Transient
+    private static final long serialVersionUID = 3591054897680176342L;
+
+    @PartitionKey(value = 0)
+    @Column(name = ModelConstants.ID_PROPERTY)
+    private UUID id;
+
+    @PartitionKey(value = 1)
+    @Column(name = ModelConstants.WIDGET_TYPE_TENANT_ID_PROPERTY)
+    private UUID tenantId;
+
+    @PartitionKey(value = 2)
+    @Column(name = ModelConstants.WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY)
+    private String bundleAlias;
+
+    @Column(name = ModelConstants.WIDGET_TYPE_ALIAS_PROPERTY)
+    private String alias;
+
+    @Column(name = ModelConstants.WIDGET_TYPE_NAME_PROPERTY)
+    private String name;
+
+    @Column(name = ModelConstants.WIDGET_TYPE_DESCRIPTOR_PROPERTY, codec = JsonCodec.class)
+    private JsonNode descriptor;
+
+    public WidgetTypeEntity() {
+        super();
+    }
+
+    public WidgetTypeEntity(WidgetType widgetType) {
+        if (widgetType.getId() != null) {
+            this.id = widgetType.getId().getId();
+        }
+        if (widgetType.getTenantId() != null) {
+            this.tenantId = widgetType.getTenantId().getId();
+        }
+        this.bundleAlias = widgetType.getBundleAlias();
+        this.alias = widgetType.getAlias();
+        this.name = widgetType.getName();
+        this.descriptor = widgetType.getDescriptor();
+    }
+
+    @Override
+    public UUID getId() {
+        return id;
+    }
+
+    @Override
+    public void setId(UUID id) {
+        this.id = id;
+    }
+
+    public UUID getTenantId() {
+        return tenantId;
+    }
+
+    public void setTenantId(UUID tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getBundleAlias() {
+        return bundleAlias;
+    }
+
+    public void setBundleAlias(String bundleAlias) {
+        this.bundleAlias = bundleAlias;
+    }
+
+    public String getAlias() {
+        return alias;
+    }
+
+    public void setAlias(String alias) {
+        this.alias = alias;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public JsonNode getDescriptor() {
+        return descriptor;
+    }
+
+    public void setDescriptor(JsonNode descriptor) {
+        this.descriptor = descriptor;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id != null ? id.hashCode() : 0;
+        result = 31 * result + (tenantId != null ? tenantId.hashCode() : 0);
+        result = 31 * result + (bundleAlias != null ? bundleAlias.hashCode() : 0);
+        result = 31 * result + (alias != null ? alias.hashCode() : 0);
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        result = 31 * result + (descriptor != null ? descriptor.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        WidgetTypeEntity that = (WidgetTypeEntity) o;
+
+        if (id != null ? !id.equals(that.id) : that.id != null) return false;
+        if (tenantId != null ? !tenantId.equals(that.tenantId) : that.tenantId != null) return false;
+        if (bundleAlias != null ? !bundleAlias.equals(that.bundleAlias) : that.bundleAlias != null) return false;
+        if (alias != null ? !alias.equals(that.alias) : that.alias != null) return false;
+        if (name != null ? !name.equals(that.name) : that.name != null) return false;
+        return descriptor != null ? descriptor.equals(that.descriptor) : that.descriptor == null;
+    }
+
+    @Override
+    public String toString() {
+        final StringBuilder sb = new StringBuilder("WidgetTypeEntity{");
+        sb.append("id=").append(id);
+        sb.append(", tenantId=").append(tenantId);
+        sb.append(", bundleAlias='").append(bundleAlias).append('\'');
+        sb.append(", alias='").append(alias).append('\'');
+        sb.append(", name='").append(name).append('\'');
+        sb.append(", descriptor=").append(descriptor);
+        sb.append('}');
+        return sb.toString();
+    }
+
+    @Override
+    public WidgetType toData() {
+        WidgetType widgetType = new WidgetType(new WidgetTypeId(id));
+        widgetType.setCreatedTime(UUIDs.unixTimestamp(id));
+        if (tenantId != null) {
+            widgetType.setTenantId(new TenantId(tenantId));
+        }
+        widgetType.setBundleAlias(bundleAlias);
+        widgetType.setAlias(alias);
+        widgetType.setName(name);
+        widgetType.setDescriptor(descriptor);
+        return widgetType;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/model/wrapper/EntityResultSet.java b/dao/src/main/java/org/thingsboard/server/dao/model/wrapper/EntityResultSet.java
new file mode 100644
index 0000000..be02f72
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/model/wrapper/EntityResultSet.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.model.wrapper;
+
+
+import com.datastax.driver.core.ResultSet;
+
+public class EntityResultSet<T> {
+
+  private ResultSet resultSet;
+  private T entity;
+
+  public EntityResultSet(ResultSet resultSet, T entity) {
+    this.resultSet = resultSet;
+    this.entity = entity;
+  }
+
+  public T getEntity() {
+    return entity;
+  }
+
+  public boolean wasApplied() {
+    return resultSet.wasApplied();
+  }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginDao.java
new file mode 100644
index 0000000..2bed72c
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginDao.java
@@ -0,0 +1,123 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.plugin;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.querybuilder.Select;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.PluginId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.model.PluginMetaDataEntity;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.*;
+import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+
+@Component
+@Slf4j
+public class BasePluginDao extends AbstractSearchTextDao<PluginMetaDataEntity> implements PluginDao {
+
+    @Override
+    protected Class<PluginMetaDataEntity> getColumnFamilyClass() {
+        return PluginMetaDataEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return ModelConstants.PLUGIN_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public PluginMetaDataEntity save(PluginMetaData plugin) {
+        return save(new PluginMetaDataEntity(plugin));
+    }
+
+    @Override
+    public PluginMetaDataEntity findById(PluginId pluginId) {
+        log.debug("Search plugin meta-data entity by id [{}]", pluginId);
+        PluginMetaDataEntity entity = super.findById(pluginId.getId());
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}] for plugin entity [{}]", entity != null, entity);
+        } else {
+            log.debug("Search result: [{}]", entity != null);
+        }
+        return entity;
+    }
+
+    @Override
+    public PluginMetaDataEntity findByApiToken(String apiToken) {
+        log.debug("Search plugin meta-data entity by api token [{}]", apiToken);
+        Select.Where query = select().from(ModelConstants.PLUGIN_BY_API_TOKEN_COLUMN_FAMILY_NAME).where(eq(ModelConstants.PLUGIN_API_TOKEN_PROPERTY, apiToken));
+        log.trace("Execute query [{}]", query);
+        PluginMetaDataEntity entity = findOneByStatement(query);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}] for plugin entity [{}]", entity != null, entity);
+        } else {
+            log.debug("Search result: [{}]", entity != null);
+        }
+        return entity;
+    }
+
+    @Override
+    public void deleteById(UUID id) {
+        log.debug("Delete plugin meta-data entity by id [{}]", id);
+        ResultSet resultSet = removeById(id);
+        log.debug("Delete result: [{}]", resultSet.wasApplied());
+    }
+
+    @Override
+    public void deleteById(PluginId pluginId) {
+        deleteById(pluginId.getId());
+    }
+
+    @Override
+    public List<PluginMetaDataEntity> findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) {
+        log.debug("Try to find plugins by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<PluginMetaDataEntity> entities = findPageWithTextSearch(ModelConstants.PLUGIN_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(ModelConstants.PLUGIN_TENANT_ID_PROPERTY, tenantId.getId())), pageLink);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}]", Arrays.toString(entities.toArray()));
+        } else {
+            log.debug("Search result: [{}]", entities.size());
+        }
+        return entities;
+    }
+
+    @Override
+    public List<PluginMetaDataEntity> findAllTenantPluginsByTenantId(UUID tenantId, TextPageLink pageLink) {
+        log.debug("Try to find all tenant plugins by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<PluginMetaDataEntity> pluginEntities = findPageWithTextSearch(ModelConstants.PLUGIN_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(in(ModelConstants.PLUGIN_TENANT_ID_PROPERTY, Arrays.asList(NULL_UUID, tenantId))),
+                pageLink);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}]", Arrays.toString(pluginEntities.toArray()));
+        } else {
+            log.debug("Search result: [{}]", pluginEntities.size());
+        }
+        return pluginEntities;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java
new file mode 100644
index 0000000..732d957
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/BasePluginService.java
@@ -0,0 +1,260 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.plugin;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.id.PluginId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.dao.component.ComponentDescriptorService;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.exception.DatabaseException;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.model.PluginMetaDataEntity;
+import org.thingsboard.server.dao.model.RuleMetaDataEntity;
+import org.thingsboard.server.dao.rule.RuleDao;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.service.Validator;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+
+@Service
+@Slf4j
+public class BasePluginService implements PluginService {
+
+    //TODO: move to a better place.
+    public static final TenantId SYSTEM_TENANT = new TenantId(ModelConstants.NULL_UUID);
+
+    @Autowired
+    private PluginDao pluginDao;
+
+    @Autowired
+    private RuleDao ruleDao;
+
+    @Autowired
+    private ComponentDescriptorService componentDescriptorService;
+
+    @Override
+    public PluginMetaData savePlugin(PluginMetaData plugin) {
+        pluginValidator.validate(plugin);
+        if (plugin.getTenantId() == null) {
+            log.trace("Save system plugin metadata with predefined id {}", SYSTEM_TENANT);
+            plugin.setTenantId(SYSTEM_TENANT);
+        }
+        if (plugin.getId() != null) {
+            PluginMetaData oldVersion = getData(pluginDao.findById(plugin.getId()));
+            if (plugin.getState() == null) {
+                plugin.setState(oldVersion.getState());
+            } else if (plugin.getState() != oldVersion.getState()) {
+                throw new IncorrectParameterException("Use Activate/Suspend method to control state of the plugin!");
+            }
+        } else {
+            if (plugin.getState() == null) {
+                plugin.setState(ComponentLifecycleState.SUSPENDED);
+            } else if (plugin.getState() != ComponentLifecycleState.SUSPENDED) {
+                throw new IncorrectParameterException("Use Activate/Suspend method to control state of the plugin!");
+            }
+        }
+        ComponentDescriptor descriptor = componentDescriptorService.findByClazz(plugin.getClazz());
+        if (descriptor == null) {
+            throw new IncorrectParameterException("Plugin descriptor not found!");
+        } else if (!ComponentType.PLUGIN.equals(descriptor.getType())) {
+            throw new IncorrectParameterException("Plugin class is actually " + descriptor.getType() + "!");
+        }
+        PluginMetaDataEntity entity = pluginDao.findByApiToken(plugin.getApiToken());
+        if (entity != null && (plugin.getId() == null || !entity.getId().equals(plugin.getId().getId()))) {
+            throw new IncorrectParameterException("API token is already reserved!");
+        }
+        if (!componentDescriptorService.validate(descriptor, plugin.getConfiguration())) {
+            throw new IncorrectParameterException("Filters configuration is not valid!");
+        }
+        return getData(pluginDao.save(plugin));
+    }
+
+    @Override
+    public PluginMetaData findPluginById(PluginId pluginId) {
+        Validator.validateId(pluginId, "Incorrect plugin id for search request.");
+        return getData(pluginDao.findById(pluginId));
+    }
+
+    @Override
+    public PluginMetaData findPluginByApiToken(String apiToken) {
+        Validator.validateString(apiToken, "Incorrect plugin apiToken for search request.");
+        return getData(pluginDao.findByApiToken(apiToken));
+    }
+
+    @Override
+    public TextPageData<PluginMetaData> findSystemPlugins(TextPageLink pageLink) {
+        Validator.validatePageLink(pageLink, "Incorrect PageLink object for search system plugin request.");
+        List<PluginMetaDataEntity> pluginEntities = pluginDao.findByTenantIdAndPageLink(SYSTEM_TENANT, pageLink);
+        List<PluginMetaData> plugins = convertDataList(pluginEntities);
+        return new TextPageData<>(plugins, pageLink);
+    }
+
+    @Override
+    public TextPageData<PluginMetaData> findTenantPlugins(TenantId tenantId, TextPageLink pageLink) {
+        Validator.validateId(tenantId, "Incorrect tenant id for search plugins request.");
+        Validator.validatePageLink(pageLink, "Incorrect PageLink object for search plugin request.");
+        List<PluginMetaDataEntity> pluginEntities = pluginDao.findByTenantIdAndPageLink(tenantId, pageLink);
+        List<PluginMetaData> plugins = convertDataList(pluginEntities);
+        return new TextPageData<>(plugins, pageLink);
+    }
+
+    @Override
+    public List<PluginMetaData> findSystemPlugins() {
+        log.trace("Executing findSystemPlugins");
+        List<PluginMetaData> plugins = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(300);
+        TextPageData<PluginMetaData> pageData = null;
+        do {
+            pageData = findSystemPlugins(pageLink);
+            plugins.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        return plugins;
+    }
+
+    @Override
+    public TextPageData<PluginMetaData> findAllTenantPluginsByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) {
+        log.trace("Executing findAllTenantPluginsByTenantIdAndPageLink, tenantId [{}], pageLink [{}]", tenantId, pageLink);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<PluginMetaDataEntity> pluginsEntities = pluginDao.findAllTenantPluginsByTenantId(tenantId.getId(), pageLink);
+        List<PluginMetaData> plugins = convertDataList(pluginsEntities);
+        return new TextPageData<>(plugins, pageLink);
+    }
+
+    @Override
+    public List<PluginMetaData> findAllTenantPluginsByTenantId(TenantId tenantId) {
+        log.trace("Executing findAllTenantPluginsByTenantId, tenantId [{}]", tenantId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        List<PluginMetaData> plugins = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(300);
+        TextPageData<PluginMetaData> pageData = null;
+        do {
+            pageData = findAllTenantPluginsByTenantIdAndPageLink(tenantId, pageLink);
+            plugins.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        return plugins;
+    }
+
+    @Override
+    public void activatePluginById(PluginId pluginId) {
+        updateLifeCycleState(pluginId, ComponentLifecycleState.ACTIVE);
+    }
+
+    @Override
+    public void suspendPluginById(PluginId pluginId) {
+        PluginMetaDataEntity plugin = pluginDao.findById(pluginId);
+        List<RuleMetaDataEntity> affectedRules = ruleDao.findRulesByPlugin(plugin.getApiToken())
+                .stream().filter(rule -> rule.getState() == ComponentLifecycleState.ACTIVE).collect(Collectors.toList());
+        if (affectedRules.isEmpty()) {
+            updateLifeCycleState(pluginId, ComponentLifecycleState.SUSPENDED);
+        } else {
+            throw new DataValidationException("Can't suspend plugin that has active rules!");
+        }
+    }
+
+    private void updateLifeCycleState(PluginId pluginId, ComponentLifecycleState state) {
+        Validator.validateId(pluginId, "Incorrect plugin id for state change request.");
+        PluginMetaDataEntity plugin = pluginDao.findById(pluginId);
+        if (plugin != null) {
+            plugin.setState(state);
+            pluginDao.save(plugin);
+        } else {
+            throw new DatabaseException("Plugin not found!");
+        }
+    }
+
+    @Override
+    public void deletePluginById(PluginId pluginId) {
+        Validator.validateId(pluginId, "Incorrect plugin id for delete request.");
+        checkRulesAndDelete(pluginId.getId());
+    }
+
+    private void checkRulesAndDelete(UUID pluginId) {
+        PluginMetaDataEntity plugin = pluginDao.findById(pluginId);
+        List<RuleMetaDataEntity> affectedRules = ruleDao.findRulesByPlugin(plugin.getApiToken());
+        if (affectedRules.isEmpty()) {
+            pluginDao.deleteById(pluginId);
+        } else {
+            throw new DataValidationException("Plugin deletion will affect existing rules!");
+        }
+    }
+
+    @Override
+    public void deletePluginsByTenantId(TenantId tenantId) {
+        Validator.validateId(tenantId, "Incorrect tenant id for delete plugins request.");
+        tenantPluginRemover.removeEntitites(tenantId);
+    }
+
+
+    private DataValidator<PluginMetaData> pluginValidator =
+            new DataValidator<PluginMetaData>() {
+                @Override
+                protected void validateDataImpl(PluginMetaData plugin) {
+                    if (StringUtils.isEmpty(plugin.getName())) {
+                        throw new DataValidationException("Plugin name should be specified!.");
+                    }
+                    if (StringUtils.isEmpty(plugin.getClazz())) {
+                        throw new DataValidationException("Plugin clazz should be specified!.");
+                    }
+                    if (StringUtils.isEmpty(plugin.getApiToken())) {
+                        throw new DataValidationException("Plugin api token is not set!");
+                    }
+                    if (plugin.getConfiguration() == null) {
+                        throw new DataValidationException("Plugin configuration is not set!");
+                    }
+                }
+            };
+
+    private PaginatedRemover<TenantId, PluginMetaDataEntity> tenantPluginRemover =
+            new PaginatedRemover<TenantId, PluginMetaDataEntity>() {
+
+                @Override
+                protected List<PluginMetaDataEntity> findEntities(TenantId id, TextPageLink pageLink) {
+                    return pluginDao.findByTenantIdAndPageLink(id, pageLink);
+                }
+
+                @Override
+                protected void removeEntity(PluginMetaDataEntity entity) {
+                    checkRulesAndDelete(entity.getId());
+                }
+            };
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginDao.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginDao.java
new file mode 100644
index 0000000..d6b7434
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginDao.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.plugin;
+
+import org.thingsboard.server.common.data.id.PluginId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.PluginMetaDataEntity;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface PluginDao extends Dao<PluginMetaDataEntity> {
+
+    PluginMetaDataEntity save(PluginMetaData plugin);
+
+    PluginMetaDataEntity findById(PluginId pluginId);
+
+    PluginMetaDataEntity findByApiToken(String apiToken);
+
+    void deleteById(UUID id);
+
+    void deleteById(PluginId pluginId);
+
+    List<PluginMetaDataEntity> findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink);
+
+    /**
+     * Find all tenant plugins (including system) by tenantId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param pageLink the page link
+     * @return the list of plugins objects
+     */
+    List<PluginMetaDataEntity> findAllTenantPluginsByTenantId(UUID tenantId, TextPageLink pageLink);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginService.java b/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginService.java
new file mode 100644
index 0000000..7c16bd4
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/plugin/PluginService.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.plugin;
+
+import org.thingsboard.server.common.data.id.PluginId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+
+import java.util.List;
+
+public interface PluginService {
+
+    PluginMetaData savePlugin(PluginMetaData plugin);
+
+    PluginMetaData findPluginById(PluginId pluginId);
+
+    PluginMetaData findPluginByApiToken(String apiToken);
+
+    TextPageData<PluginMetaData> findSystemPlugins(TextPageLink pageLink);
+
+    TextPageData<PluginMetaData> findTenantPlugins(TenantId tenantId, TextPageLink pageLink);
+
+    List<PluginMetaData> findSystemPlugins();
+
+    TextPageData<PluginMetaData> findAllTenantPluginsByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink);
+
+    List<PluginMetaData> findAllTenantPluginsByTenantId(TenantId tenantId);
+
+    void activatePluginById(PluginId pluginId);
+
+    void suspendPluginById(PluginId pluginId);
+
+    void deletePluginById(PluginId pluginId);
+
+    void deletePluginsByTenantId(TenantId tenantId);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleDao.java
new file mode 100644
index 0000000..0070b79
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleDao.java
@@ -0,0 +1,108 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.rule;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.querybuilder.Select;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.id.RuleId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.model.RuleMetaDataEntity;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.*;
+import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+
+@Component
+@Slf4j
+public class BaseRuleDao extends AbstractSearchTextDao<RuleMetaDataEntity> implements RuleDao {
+
+    @Override
+    protected Class<RuleMetaDataEntity> getColumnFamilyClass() {
+        return RuleMetaDataEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return ModelConstants.RULE_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public RuleMetaDataEntity findById(RuleId ruleId) {
+        return findById(ruleId.getId());
+    }
+
+    @Override
+    public RuleMetaDataEntity save(RuleMetaData rule) {
+        return save(new RuleMetaDataEntity(rule));
+    }
+
+    @Override
+    public List<RuleMetaDataEntity> findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) {
+        log.debug("Try to find rules by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<RuleMetaDataEntity> entities = findPageWithTextSearch(ModelConstants.RULE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(ModelConstants.RULE_TENANT_ID_PROPERTY, tenantId.getId())), pageLink);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}]", Arrays.toString(entities.toArray()));
+        } else {
+            log.debug("Search result: [{}]", entities.size());
+        }
+        return entities;
+    }
+
+    @Override
+    public List<RuleMetaDataEntity> findAllTenantRulesByTenantId(UUID tenantId, TextPageLink pageLink) {
+        log.debug("Try to find all tenant rules by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<RuleMetaDataEntity> entities = findPageWithTextSearch(ModelConstants.RULE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(in(ModelConstants.RULE_TENANT_ID_PROPERTY, Arrays.asList(NULL_UUID, tenantId))),
+                pageLink);
+        if (log.isTraceEnabled()) {
+            log.trace("Search result: [{}]", Arrays.toString(entities.toArray()));
+        } else {
+            log.debug("Search result: [{}]", entities.size());
+        }
+        return entities;
+    }
+
+    @Override
+    public List<RuleMetaDataEntity> findRulesByPlugin(String pluginToken) {
+        log.debug("Search rules by api token [{}]", pluginToken);
+        Select select = select().from(ModelConstants.RULE_BY_PLUGIN_TOKEN);
+        Select.Where query = select.where();
+        query.and(eq(ModelConstants.RULE_PLUGIN_TOKEN_PROPERTY, pluginToken));
+        return findListByStatement(query);
+    }
+
+    @Override
+    public void deleteById(UUID id) {
+        log.debug("Delete rule meta-data entity by id [{}]", id);
+        ResultSet resultSet = removeById(id);
+        log.debug("Delete result: [{}]", resultSet.wasApplied());
+    }
+
+    @Override
+    public void deleteById(RuleId ruleId) {
+        deleteById(ruleId.getId());
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java
new file mode 100644
index 0000000..b0755e7
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/BaseRuleService.java
@@ -0,0 +1,294 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.rule;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.id.RuleId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentLifecycleState;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.dao.component.ComponentDescriptorService;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.exception.DatabaseException;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.RuleMetaDataEntity;
+import org.thingsboard.server.dao.plugin.PluginService;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.service.Validator;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+import static org.thingsboard.server.dao.service.Validator.validateId;
+import static org.thingsboard.server.dao.service.Validator.validatePageLink;
+
+@Service
+@Slf4j
+public class BaseRuleService implements RuleService {
+
+    private final TenantId systemTenantId = new TenantId(NULL_UUID);
+
+    @Autowired
+    public RuleDao ruleDao;
+
+    @Autowired
+    public PluginService pluginService;
+
+    @Autowired
+    private ComponentDescriptorService componentDescriptorService;
+
+    @Override
+    public RuleMetaData saveRule(RuleMetaData rule) {
+        ruleValidator.validate(rule);
+        if (rule.getTenantId() == null) {
+            log.trace("Save system rule metadata with predefined id {}", systemTenantId);
+            rule.setTenantId(systemTenantId);
+        }
+        if (rule.getId() != null) {
+            RuleMetaData oldVersion = getData(ruleDao.findById(rule.getId()));
+            if (rule.getState() == null) {
+                rule.setState(oldVersion.getState());
+            } else if (rule.getState() != oldVersion.getState()) {
+                throw new IncorrectParameterException("Use Activate/Suspend method to control state of the rule!");
+            }
+        } else {
+            if (rule.getState() == null) {
+                rule.setState(ComponentLifecycleState.SUSPENDED);
+            } else if (rule.getState() != ComponentLifecycleState.SUSPENDED) {
+                throw new IncorrectParameterException("Use Activate/Suspend method to control state of the rule!");
+            }
+        }
+
+        validateFilters(rule.getFilters());
+        if (rule.getProcessor() != null && !rule.getProcessor().isNull()) {
+            validateComponentJson(rule.getProcessor(), ComponentType.PROCESSOR);
+        }
+        validateComponentJson(rule.getAction(), ComponentType.ACTION);
+        validateRuleAndPluginState(rule);
+        return getData(ruleDao.save(rule));
+    }
+
+    private void validateFilters(JsonNode filtersJson) {
+        if (filtersJson == null || filtersJson.isNull()) {
+            throw new IncorrectParameterException("Rule filters are required!");
+        }
+        if (!filtersJson.isArray()) {
+            throw new IncorrectParameterException("Filters json is not an array!");
+        }
+        ArrayNode filtersArray = (ArrayNode) filtersJson;
+        for (int i = 0; i < filtersArray.size(); i++) {
+            validateComponentJson(filtersArray.get(i), ComponentType.FILTER);
+        }
+    }
+
+    private void validateComponentJson(JsonNode json, ComponentType type) {
+        if (json == null || json.isNull()) {
+            throw new IncorrectParameterException(type.name() + " is required!");
+        }
+        String clazz = getIfValid(type.name(), json, "clazz", JsonNode::isTextual, JsonNode::asText);
+        String name = getIfValid(type.name(), json, "name", JsonNode::isTextual, JsonNode::asText);
+        JsonNode configuration = getIfValid(type.name(), json, "configuration", JsonNode::isObject, node -> node);
+        ComponentDescriptor descriptor = componentDescriptorService.findByClazz(clazz);
+        if (descriptor == null) {
+            throw new IncorrectParameterException(type.name() + " clazz " + clazz + " is not a valid component!");
+        }
+        if (descriptor.getType() != type) {
+            throw new IncorrectParameterException("Clazz " + clazz + " is not a valid " + type.name() + " component!");
+        }
+        if (!componentDescriptorService.validate(descriptor, configuration)) {
+            throw new IncorrectParameterException(type.name() + " configuration is not valid!");
+        }
+    }
+
+    private void validateRuleAndPluginState(RuleMetaData rule) {
+        PluginMetaData pluginMd = pluginService.findPluginByApiToken(rule.getPluginToken());
+        if (pluginMd == null) {
+            throw new IncorrectParameterException("Rule points to non-existent plugin!");
+        }
+        if (!pluginMd.getTenantId().equals(systemTenantId) && !pluginMd.getTenantId().equals(rule.getTenantId())) {
+            throw new IncorrectParameterException("Rule access plugin that belongs to different tenant!");
+        }
+        if (rule.getState() == ComponentLifecycleState.ACTIVE && pluginMd.getState() != ComponentLifecycleState.ACTIVE) {
+            throw new IncorrectParameterException("Can't save active rule that points to inactive plugin!");
+        }
+        ComponentDescriptor pluginDescriptor = componentDescriptorService.findByClazz(pluginMd.getClazz());
+        String actionClazz = getIfValid(ComponentType.ACTION.name(), rule.getAction(), "clazz", JsonNode::isTextual, JsonNode::asText);
+        if (!Arrays.asList(pluginDescriptor.getActions().split(",")).contains(actionClazz)) {
+            throw new IncorrectParameterException("Rule's action is not supported by plugin with token " + rule.getPluginToken() + "!");
+        }
+    }
+
+    private static <T> T getIfValid(String parentName, JsonNode node, String name, Function<JsonNode, Boolean> validator, Function<JsonNode, T> extractor) {
+        if (!node.has(name)) {
+            throw new IncorrectParameterException(parentName + "'s " + name + " is not set!");
+        } else {
+            JsonNode value = node.get(name);
+            if (validator.apply(value)) {
+                return extractor.apply(value);
+            } else {
+                throw new IncorrectParameterException(parentName + "'s " + name + " is not valid!");
+            }
+        }
+    }
+
+    @Override
+    public RuleMetaData findRuleById(RuleId ruleId) {
+        validateId(ruleId, "Incorrect rule id for search rule request.");
+        return getData(ruleDao.findById(ruleId.getId()));
+    }
+
+    @Override
+    public List<RuleMetaData> findPluginRules(String pluginToken) {
+        List<RuleMetaDataEntity> ruleEntities = ruleDao.findRulesByPlugin(pluginToken);
+        return convertDataList(ruleEntities);
+    }
+
+    @Override
+    public TextPageData<RuleMetaData> findSystemRules(TextPageLink pageLink) {
+        validatePageLink(pageLink, "Incorrect PageLink object for search rule request.");
+        List<RuleMetaDataEntity> ruleEntities = ruleDao.findByTenantIdAndPageLink(systemTenantId, pageLink);
+        List<RuleMetaData> plugins = convertDataList(ruleEntities);
+        return new TextPageData<>(plugins, pageLink);
+    }
+
+    @Override
+    public TextPageData<RuleMetaData> findTenantRules(TenantId tenantId, TextPageLink pageLink) {
+        validateId(tenantId, "Incorrect tenant id for search rule request.");
+        validatePageLink(pageLink, "Incorrect PageLink object for search rule request.");
+        List<RuleMetaDataEntity> ruleEntities = ruleDao.findByTenantIdAndPageLink(tenantId, pageLink);
+        List<RuleMetaData> plugins = convertDataList(ruleEntities);
+        return new TextPageData<>(plugins, pageLink);
+    }
+
+    @Override
+    public List<RuleMetaData> findSystemRules() {
+        log.trace("Executing findSystemRules");
+        List<RuleMetaData> rules = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(300);
+        TextPageData<RuleMetaData> pageData = null;
+        do {
+            pageData = findSystemRules(pageLink);
+            rules.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        return rules;
+    }
+
+    @Override
+    public TextPageData<RuleMetaData> findAllTenantRulesByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) {
+        log.trace("Executing findAllTenantRulesByTenantIdAndPageLink, tenantId [{}], pageLink [{}]", tenantId, pageLink);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<RuleMetaDataEntity> rulesEntities = ruleDao.findAllTenantRulesByTenantId(tenantId.getId(), pageLink);
+        List<RuleMetaData> rules = convertDataList(rulesEntities);
+        return new TextPageData<>(rules, pageLink);
+    }
+
+    @Override
+    public List<RuleMetaData> findAllTenantRulesByTenantId(TenantId tenantId) {
+        log.trace("Executing findAllTenantRulesByTenantId, tenantId [{}]", tenantId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        List<RuleMetaData> rules = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(300);
+        TextPageData<RuleMetaData> pageData = null;
+        do {
+            pageData = findAllTenantRulesByTenantIdAndPageLink(tenantId, pageLink);
+            rules.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        return rules;
+    }
+
+    @Override
+    public void deleteRuleById(RuleId ruleId) {
+        validateId(ruleId, "Incorrect rule id for delete rule request.");
+        ruleDao.deleteById(ruleId);
+    }
+
+    @Override
+    public void activateRuleById(RuleId ruleId) {
+        updateLifeCycleState(ruleId, ComponentLifecycleState.ACTIVE);
+
+    }
+
+    @Override
+    public void suspendRuleById(RuleId ruleId) {
+        updateLifeCycleState(ruleId, ComponentLifecycleState.SUSPENDED);
+    }
+
+    private void updateLifeCycleState(RuleId ruleId, ComponentLifecycleState state) {
+        Validator.validateId(ruleId, "Incorrect rule id for state change request.");
+        RuleMetaDataEntity rule = ruleDao.findById(ruleId);
+        if (rule != null) {
+            rule.setState(state);
+            validateRuleAndPluginState(getData(rule));
+            ruleDao.save(rule);
+        } else {
+            throw new DatabaseException("Plugin not found!");
+        }
+    }
+
+    @Override
+    public void deleteRulesByTenantId(TenantId tenantId) {
+        validateId(tenantId, "Incorrect tenant id for delete rules request.");
+        tenantRulesRemover.removeEntitites(tenantId);
+    }
+
+    private DataValidator<RuleMetaData> ruleValidator =
+            new DataValidator<RuleMetaData>() {
+                @Override
+                protected void validateDataImpl(RuleMetaData rule) {
+                    if (StringUtils.isEmpty(rule.getName())) {
+                        throw new DataValidationException("Rule name should be specified!.");
+                    }
+                }
+            };
+
+    private PaginatedRemover<TenantId, RuleMetaDataEntity> tenantRulesRemover =
+            new PaginatedRemover<TenantId, RuleMetaDataEntity>() {
+
+                @Override
+                protected List<RuleMetaDataEntity> findEntities(TenantId id, TextPageLink pageLink) {
+                    return ruleDao.findByTenantIdAndPageLink(id, pageLink);
+                }
+
+                @Override
+                protected void removeEntity(RuleMetaDataEntity entity) {
+                    ruleDao.deleteById(entity.getId());
+                }
+            };
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleDao.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleDao.java
new file mode 100644
index 0000000..cdca0ed
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleDao.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.rule;
+
+import org.thingsboard.server.common.data.id.RuleId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.RuleMetaDataEntity;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface RuleDao extends Dao<RuleMetaDataEntity> {
+
+    RuleMetaDataEntity save(RuleMetaData rule);
+
+    RuleMetaDataEntity findById(RuleId ruleId);
+
+    List<RuleMetaDataEntity> findRulesByPlugin(String pluginToken);
+
+    List<RuleMetaDataEntity> findByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink);
+
+    /**
+     * Find all tenant rules (including system) by tenantId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param pageLink the page link
+     * @return the list of rules objects
+     */
+    List<RuleMetaDataEntity> findAllTenantRulesByTenantId(UUID tenantId, TextPageLink pageLink);
+
+    void deleteById(UUID id);
+
+    void deleteById(RuleId ruleId);
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/rule/RuleService.java b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleService.java
new file mode 100644
index 0000000..e11fa93
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/rule/RuleService.java
@@ -0,0 +1,52 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.rule;
+
+import org.thingsboard.server.common.data.id.RuleId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+
+import java.util.List;
+
+public interface RuleService {
+
+    RuleMetaData saveRule(RuleMetaData device);
+
+    RuleMetaData findRuleById(RuleId ruleId);
+
+    List<RuleMetaData> findPluginRules(String pluginToken);
+
+    TextPageData<RuleMetaData> findSystemRules(TextPageLink pageLink);
+
+    TextPageData<RuleMetaData> findTenantRules(TenantId tenantId, TextPageLink pageLink);
+
+    List<RuleMetaData> findSystemRules();
+
+    TextPageData<RuleMetaData> findAllTenantRulesByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink);
+
+    List<RuleMetaData> findAllTenantRulesByTenantId(TenantId tenantId);
+
+    void activateRuleById(RuleId ruleId);
+
+    void suspendRuleById(RuleId ruleId);
+
+    void deleteRuleById(RuleId ruleId);
+
+    void deleteRulesByTenantId(TenantId tenantId);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java
new file mode 100644
index 0000000..87101c7
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/DataValidator.java
@@ -0,0 +1,100 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.validator.routines.EmailValidator;
+import org.thingsboard.server.common.data.BaseData;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.JsonNode;
+
+@Slf4j
+public abstract class DataValidator<D extends BaseData<?>> {
+
+    private static EmailValidator emailValidator = EmailValidator.getInstance();
+    
+    public void validate(D data) {
+        try {
+            if (data == null) {
+                throw new DataValidationException("Data object can't be null!");
+            }
+            validateDataImpl(data);
+            if (data.getId() == null) {
+                validateCreate(data);
+            } else {
+                validateUpdate(data);
+            }
+        } catch (DataValidationException e) {
+            log.error("Data object is invalid: [{}]", e.getMessage());
+            throw e;
+        }
+    }
+    
+    protected void validateDataImpl(D data) {
+    }
+    
+    protected void validateCreate(D data) {
+    }
+
+    protected void validateUpdate(D data) {
+    }
+    
+    protected boolean isSameData(D existentData, D actualData) {
+        if (actualData.getId() == null) {
+            return false;
+        } else if (!existentData.getId().equals(actualData.getId())) {
+            return false;
+        }
+        return true;
+    }
+    
+    protected static void validateEmail(String email) {
+        if (!emailValidator.isValid(email)) {
+            throw new DataValidationException("Invalid email address format '" + email + "'!");
+        }
+    }
+    
+    protected static void validateJsonStructure(JsonNode expectedNode, JsonNode actualNode) {
+        Set<String> expectedFields = new HashSet<>();        
+        Iterator<String> fieldsIterator = expectedNode.fieldNames();
+        while (fieldsIterator.hasNext()) {
+            expectedFields.add(fieldsIterator.next());
+        }
+        
+        Set<String> actualFields = new HashSet<>();        
+        fieldsIterator = actualNode.fieldNames();
+        while (fieldsIterator.hasNext()) {
+            actualFields.add(fieldsIterator.next());
+        }
+        
+        if (!expectedFields.containsAll(actualFields) || !actualFields.containsAll(expectedFields)) {
+            throw new DataValidationException("Provided json structure is different from stored one '" + actualNode + "'!");
+        }
+        
+        for (String field : actualFields) {
+            if (!actualNode.get(field).isTextual()) {
+                throw new DataValidationException("Provided json structure can't contain non-text values '" + actualNode + "'!");
+            }
+        }
+    }
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java b/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java
new file mode 100644
index 0000000..66914d5
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/PaginatedRemover.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.model.BaseEntity;
+
+public abstract class PaginatedRemover<I, E extends BaseEntity<?>> {
+
+    public void removeEntitites(I id) {
+        TextPageLink pageLink = new TextPageLink(100);
+        boolean hasNext = true;
+        while (hasNext) {
+            List<E> entities = findEntities(id, pageLink);
+            for (E entity : entities) {
+                removeEntity(entity);
+            }
+            hasNext = entities.size() == pageLink.getLimit();
+            if (hasNext) {
+                int index = entities.size()-1;
+                UUID idOffset = entities.get(index).getId();
+                pageLink.setIdOffset(idOffset);
+            }
+        } 
+    }
+    
+    protected abstract List<E> findEntities(I id, TextPageLink pageLink);
+    
+    protected abstract void removeEntity(E entity);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/Validator.java b/dao/src/main/java/org/thingsboard/server/dao/service/Validator.java
new file mode 100644
index 0000000..7b6fbbd
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/Validator.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import org.thingsboard.server.common.data.id.UUIDBased;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+
+import java.util.UUID;
+
+public class Validator {
+
+    /**
+     * This method validate <code>String</code> string. If string is invalid than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param val          the val
+     * @param errorMessage the error message for exception
+     */
+    public static void validateString(String val, String errorMessage) {
+        if (val == null || val.isEmpty()) {
+            throw new IncorrectParameterException(errorMessage);
+        }
+    }
+
+
+    /**
+     * This method validate <code>String</code> string. If string is invalid than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param val          the val
+     * @param errorMessage the error message for exception
+     */
+    public static void validatePositiveNumber(long val, String errorMessage) {
+        if (val <= 0) {
+            throw new IncorrectParameterException(errorMessage);
+        }
+    }
+
+    /**
+     * This method validate <code>UUID</code> id. If id is null than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param id           the id
+     * @param errorMessage the error message for exception
+     */
+    public static void validateId(UUID id, String errorMessage) {
+        if (id == null) {
+            throw new IncorrectParameterException(errorMessage);
+        }
+    }
+
+
+    /**
+     * This method validate <code>UUIDBased</code> id. If id is null than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param id           the id
+     * @param errorMessage the error message for exception
+     */
+    public static void validateId(UUIDBased id, String errorMessage) {
+        if (id == null || id.getId() == null) {
+            throw new IncorrectParameterException(errorMessage);
+        }
+    }
+
+    /**
+     * This method validate <code>PageLink</code> page link. If pageLink is invalid than throw
+     * <code>IncorrectParameterException</code> exception
+     *
+     * @param pageLink     the page link
+     * @param errorMessage the error message for exception
+     */
+    public static void validatePageLink(TextPageLink pageLink, String errorMessage) {
+        if (pageLink == null) {
+            throw new IncorrectParameterException(errorMessage);
+        } else if (pageLink.getLimit() < 1) {
+            throw new IncorrectParameterException(errorMessage);
+        } else if (pageLink.getIdOffset() != null && pageLink.getIdOffset().version() != 1) {
+            throw new IncorrectParameterException(errorMessage);
+        }
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java
new file mode 100644
index 0000000..c8a6e90
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDao.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.settings;
+
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.AdminSettingsEntity;
+
+public interface AdminSettingsDao extends Dao<AdminSettingsEntity> {
+
+    /**
+     * Save or update admin settings object
+     *
+     * @param adminSettings the admin settings object
+     * @return saved admin settings object
+     */
+    AdminSettingsEntity save(AdminSettings adminSettings);
+    
+    /**
+     * Find admin settings by key.
+     *
+     * @param key the key
+     * @return the admin settings object
+     */
+    AdminSettingsEntity findByKey(String key);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDaoImpl.java
new file mode 100644
index 0000000..0a99b02
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsDaoImpl.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.settings;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_BY_KEY_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.ADMIN_SETTINGS_KEY_PROPERTY;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.dao.AbstractModelDao;
+import org.thingsboard.server.dao.model.AdminSettingsEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
+
+import com.datastax.driver.core.querybuilder.Select.Where;
+
+@Component
+@Slf4j
+public class AdminSettingsDaoImpl extends AbstractModelDao<AdminSettingsEntity> implements AdminSettingsDao {
+
+    @Override
+    protected Class<AdminSettingsEntity> getColumnFamilyClass() {
+        return AdminSettingsEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return ADMIN_SETTINGS_COLUMN_FAMILY_NAME;
+    }
+    
+    @Override
+    public AdminSettingsEntity save(AdminSettings adminSettings) {
+        log.debug("Save admin settings [{}] ", adminSettings);
+        return save(new AdminSettingsEntity(adminSettings));
+    }
+
+    @Override
+    public AdminSettingsEntity findByKey(String key) {
+        log.debug("Try to find admin settings by key [{}] ", key);
+        Where query = select().from(ADMIN_SETTINGS_BY_KEY_COLUMN_FAMILY_NAME).where(eq(ADMIN_SETTINGS_KEY_PROPERTY, key));
+        log.trace("Execute query {}", query);
+        AdminSettingsEntity adminSettingsEntity = findOneByStatement(query);
+        log.trace("Found admin settings [{}] by key [{}]", adminSettingsEntity, key);
+        return adminSettingsEntity;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
new file mode 100644
index 0000000..72492a8
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsService.java
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.settings;
+
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.id.AdminSettingsId;
+
+public interface AdminSettingsService {
+
+    public AdminSettings findAdminSettingsById(AdminSettingsId adminSettingsId);
+
+    public AdminSettings findAdminSettingsByKey(String key);
+    
+    public AdminSettings saveAdminSettings(AdminSettings adminSettings);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
new file mode 100644
index 0000000..cb4ed01
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/settings/AdminSettingsServiceImpl.java
@@ -0,0 +1,88 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.settings;
+
+import static org.thingsboard.server.dao.DaoUtil.getData;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.common.data.id.AdminSettingsId;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.AdminSettingsEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.service.Validator;
+
+@Service
+@Slf4j
+public class AdminSettingsServiceImpl implements AdminSettingsService {
+    
+    @Autowired
+    private AdminSettingsDao adminSettingsDao;
+
+    @Override
+    public AdminSettings findAdminSettingsById(AdminSettingsId adminSettingsId) {
+        log.trace("Executing findAdminSettingsById [{}]", adminSettingsId);
+        Validator.validateId(adminSettingsId, "Incorrect adminSettingsId " + adminSettingsId);
+        AdminSettingsEntity adminSettingsEntity = adminSettingsDao.findById(adminSettingsId.getId());
+        return getData(adminSettingsEntity);
+    }
+
+    @Override
+    public AdminSettings findAdminSettingsByKey(String key) {
+        log.trace("Executing findAdminSettingsByKey [{}]", key);
+        Validator.validateString(key, "Incorrect key " + key);
+        AdminSettingsEntity adminSettingsEntity = adminSettingsDao.findByKey(key);
+        return getData(adminSettingsEntity);
+    }
+
+    @Override
+    public AdminSettings saveAdminSettings(AdminSettings adminSettings) {
+        log.trace("Executing saveAdminSettings [{}]", adminSettings);
+        adminSettingsValidator.validate(adminSettings);
+        AdminSettingsEntity adminSettingsEntity = adminSettingsDao.save(adminSettings);
+        return getData(adminSettingsEntity);
+    }
+    
+    private DataValidator<AdminSettings> adminSettingsValidator =
+            new DataValidator<AdminSettings>() {
+        
+                @Override
+                protected void validateCreate(AdminSettings adminSettings) {
+                    throw new DataValidationException("Creation of new admin settings entry is prohibited!");
+                }
+        
+                @Override
+                protected void validateDataImpl(AdminSettings adminSettings) {
+                    if (StringUtils.isEmpty(adminSettings.getKey())) {
+                        throw new DataValidationException("Key should be specified!");
+                    }
+                    if (adminSettings.getJsonValue() == null) {
+                        throw new DataValidationException("Json value should be specified!");
+                    }
+                    AdminSettings existentAdminSettingsWithKey = findAdminSettingsByKey(adminSettings.getKey());
+                    if (existentAdminSettingsWithKey == null || !isSameData(existentAdminSettingsWithKey, adminSettings)) {
+                        throw new DataValidationException("Changing key of admin settings entry is prohibited!");
+                    }
+                    validateJsonStructure(existentAdminSettingsWithKey.getJsonValue(), adminSettings.getJsonValue());
+                }
+    };
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDao.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDao.java
new file mode 100644
index 0000000..98894d2
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDao.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.tenant;
+
+import java.util.List;
+
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.TenantEntity;
+
+public interface TenantDao extends Dao<TenantEntity> {
+
+    /**
+     * Save or update tenant object
+     *
+     * @param tenant the tenant object
+     * @return saved tenant object
+     */
+    TenantEntity save(Tenant tenant);
+    
+    /**
+     * Find tenants by region and page link.
+     * 
+     * @param region the region
+     * @param pageLink the page link
+     * @return the list of tenant objects
+     */
+    List<TenantEntity> findTenantsByRegion(String region, TextPageLink pageLink);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDaoImpl.java
new file mode 100644
index 0000000..18af130
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantDaoImpl.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.tenant;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static org.thingsboard.server.dao.model.ModelConstants.TENANT_BY_REGION_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.TENANT_COLUMN_FAMILY_NAME;
+import static org.thingsboard.server.dao.model.ModelConstants.TENANT_REGION_PROPERTY;
+
+import java.util.Arrays;
+import java.util.List;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.TenantEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+@Component
+@Slf4j
+public class TenantDaoImpl extends AbstractSearchTextDao<TenantEntity> implements TenantDao {
+
+    @Override
+    protected Class<TenantEntity> getColumnFamilyClass() {
+        return TenantEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return TENANT_COLUMN_FAMILY_NAME;
+    }
+    
+    @Override
+    public TenantEntity save(Tenant tenant) {
+        log.debug("Save tenant [{}] ", tenant);
+        return save(new TenantEntity(tenant));
+    }
+
+    @Override
+    public List<TenantEntity> findTenantsByRegion(String region, TextPageLink pageLink) {
+        log.debug("Try to find tenants by region [{}] and pageLink [{}]", region, pageLink);
+        List<TenantEntity> tenantEntities = findPageWithTextSearch(TENANT_BY_REGION_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME, 
+                Arrays.asList(eq(TENANT_REGION_PROPERTY, region)), 
+                pageLink); 
+        log.trace("Found tenants [{}] by region [{}] and pageLink [{}]", tenantEntities, region, pageLink);
+        return tenantEntities;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java
new file mode 100644
index 0000000..2778415
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantService.java
@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.tenant;
+
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+
+public interface TenantService {
+
+    public Tenant findTenantById(TenantId tenantId);
+    
+    public Tenant saveTenant(Tenant tenant);
+    
+    public void deleteTenant(TenantId tenantId);
+    
+    public TextPageData<Tenant> findTenants(TextPageLink pageLink);
+    
+    //public TextPageData<Tenant> findTenantsByTitle(String title, PageLink pageLink);
+    
+    public void deleteTenants();
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
new file mode 100644
index 0000000..622adf7
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/tenant/TenantServiceImpl.java
@@ -0,0 +1,148 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.tenant;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+
+import java.util.List;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.dao.dashboard.DashboardService;
+import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.TenantEntity;
+import org.thingsboard.server.dao.plugin.PluginService;
+import org.thingsboard.server.dao.rule.RuleService;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.user.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.widget.WidgetsBundleService;
+
+@Service
+@Slf4j
+public class TenantServiceImpl implements TenantService {
+    
+    private static final String DEFAULT_TENANT_REGION = "Global";
+
+    @Autowired
+    private TenantDao tenantDao;
+    
+    @Autowired
+    private UserService userService;
+    
+    @Autowired
+    private CustomerService customerService;
+    
+    @Autowired
+    private DeviceService deviceService;
+
+    @Autowired
+    private WidgetsBundleService widgetsBundleService;
+
+    @Autowired
+    private DashboardService dashboardService;
+
+    @Autowired
+    private RuleService ruleService;
+
+    @Autowired
+    private PluginService pluginService;
+    
+    @Override
+    public Tenant findTenantById(TenantId tenantId) {
+        log.trace("Executing findTenantById [{}]", tenantId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        TenantEntity tenantEntity = tenantDao.findById(tenantId.getId());
+        return getData(tenantEntity);
+    }
+
+    @Override
+    public Tenant saveTenant(Tenant tenant) {
+        log.trace("Executing saveTenant [{}]", tenant);
+        tenant.setRegion(DEFAULT_TENANT_REGION);
+        tenantValidator.validate(tenant);
+        TenantEntity tenantEntity = tenantDao.save(tenant);
+        return getData(tenantEntity);
+    }
+
+    @Override
+    public void deleteTenant(TenantId tenantId) {
+        log.trace("Executing deleteTenant [{}]", tenantId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        customerService.deleteCustomersByTenantId(tenantId);
+        widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
+        dashboardService.deleteDashboardsByTenantId(tenantId);
+        deviceService.deleteDevicesByTenantId(tenantId);
+        userService.deleteTenantAdmins(tenantId);
+        ruleService.deleteRulesByTenantId(tenantId);
+        pluginService.deletePluginsByTenantId(tenantId);
+        tenantDao.removeById(tenantId.getId());
+    }
+
+    @Override
+    public TextPageData<Tenant> findTenants(TextPageLink pageLink) {
+        log.trace("Executing findTenants pageLink [{}]", pageLink);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<TenantEntity> tenantEntities = tenantDao.findTenantsByRegion(DEFAULT_TENANT_REGION, pageLink);
+        List<Tenant> tenants = convertDataList(tenantEntities);
+        return new TextPageData<Tenant>(tenants, pageLink);
+    }
+
+    @Override
+    public void deleteTenants() {
+        log.trace("Executing deleteTenants");
+        tenantsRemover.removeEntitites(DEFAULT_TENANT_REGION);
+    }
+
+    private DataValidator<Tenant> tenantValidator =
+            new DataValidator<Tenant>() {
+                @Override
+                protected void validateDataImpl(Tenant tenant) {
+                    if (StringUtils.isEmpty(tenant.getTitle())) {
+                        throw new DataValidationException("Tenant title should be specified!");
+                    }
+                    if (!StringUtils.isEmpty(tenant.getEmail())) {
+                        validateEmail(tenant.getEmail());
+                    }
+                }
+    };
+    
+    private PaginatedRemover<String, TenantEntity> tenantsRemover =
+            new PaginatedRemover<String, TenantEntity>() {
+        
+        @Override
+        protected List<TenantEntity> findEntities(String region, TextPageLink pageLink) {
+            return tenantDao.findTenantsByRegion(region, pageLink);
+        }
+
+        @Override
+        protected void removeEntity(TenantEntity entity) {
+            deleteTenant(new TenantId(entity.getId()));
+        }
+    };
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDao.java
new file mode 100644
index 0000000..9913df8
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDao.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.user;
+
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.UserCredentialsEntity;
+
+/**
+ * The Interface UserCredentialsDao.
+ *
+ * @param <T> the generic type
+ */
+public interface UserCredentialsDao extends Dao<UserCredentialsEntity> {
+
+    /**
+     * Save or update user credentials object
+     *
+     * @param userCredentials the user credentials object
+     * @return saved user credentials object
+     */
+    UserCredentialsEntity save(UserCredentials userCredentials);
+
+    /**
+     * Find user credentials by user id.
+     *
+     * @param userId the user id
+     * @return the user credentials object
+     */
+    UserCredentialsEntity findByUserId(UUID userId);
+    
+    /**
+     * Find user credentials by activate token.
+     *
+     * @param activateToken the activate token
+     * @return the user credentials object
+     */
+    UserCredentialsEntity findByActivateToken(String activateToken);
+    
+    /**
+     * Find user credentials by reset token.
+     *
+     * @param resetToken the reset token
+     * @return the user credentials object
+     */
+    UserCredentialsEntity findByResetToken(String resetToken);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDaoImpl.java
new file mode 100644
index 0000000..65efdf4
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserCredentialsDaoImpl.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.user;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+
+import java.util.UUID;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.dao.AbstractModelDao;
+import org.thingsboard.server.dao.model.UserCredentialsEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Repository;
+
+import com.datastax.driver.core.querybuilder.Select.Where;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+@Component
+@Slf4j
+public class UserCredentialsDaoImpl extends AbstractModelDao<UserCredentialsEntity> implements UserCredentialsDao {
+
+    @Override
+    protected Class<UserCredentialsEntity> getColumnFamilyClass() {
+        return UserCredentialsEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return ModelConstants.USER_CREDENTIALS_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public UserCredentialsEntity save(UserCredentials userCredentials) {
+        log.debug("Save user credentials [{}] ", userCredentials);
+        return save(new UserCredentialsEntity(userCredentials));
+    }
+
+    @Override
+    public UserCredentialsEntity findByUserId(UUID userId) {
+        log.debug("Try to find user credentials by userId [{}] ", userId);
+        Where query = select().from(ModelConstants.USER_CREDENTIALS_BY_USER_COLUMN_FAMILY_NAME).where(eq(ModelConstants.USER_CREDENTIALS_USER_ID_PROPERTY, userId));
+        log.trace("Execute query {}", query);
+        UserCredentialsEntity userCredentialsEntity = findOneByStatement(query);
+        log.trace("Found user credentials [{}] by userId [{}]", userCredentialsEntity, userId);
+        return userCredentialsEntity;
+    }
+
+    @Override
+    public UserCredentialsEntity findByActivateToken(String activateToken) {
+        log.debug("Try to find user credentials by activateToken [{}] ", activateToken);
+        Where query = select().from(ModelConstants.USER_CREDENTIALS_BY_ACTIVATE_TOKEN_COLUMN_FAMILY_NAME)
+                .where(eq(ModelConstants.USER_CREDENTIALS_ACTIVATE_TOKEN_PROPERTY, activateToken));
+        log.trace("Execute query {}", query);
+        UserCredentialsEntity userCredentialsEntity = findOneByStatement(query);
+        log.trace("Found user credentials [{}] by activateToken [{}]", userCredentialsEntity, activateToken);
+        return userCredentialsEntity;
+    }
+
+    @Override
+    public UserCredentialsEntity findByResetToken(String resetToken) {
+        log.debug("Try to find user credentials by resetToken [{}] ", resetToken);
+        Where query = select().from(ModelConstants.USER_CREDENTIALS_BY_RESET_TOKEN_COLUMN_FAMILY_NAME)
+                .where(eq(ModelConstants.USER_CREDENTIALS_RESET_TOKEN_PROPERTY, resetToken));
+        log.trace("Execute query {}", query);
+        UserCredentialsEntity userCredentialsEntity = findOneByStatement(query);
+        log.trace("Found user credentials [{}] by resetToken [{}]", userCredentialsEntity, resetToken);
+        return userCredentialsEntity;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
new file mode 100644
index 0000000..45e2f51
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.user;
+
+import java.util.List;
+import java.util.UUID;
+
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.UserEntity;
+
+public interface UserDao extends Dao<UserEntity> {
+
+    /**
+     * Save or update user object
+     *
+     * @param user the user object
+     * @return saved user entity
+     */
+    UserEntity save(User user);
+
+    /**
+     * Find user by email.
+     *
+     * @param email the email
+     * @return the user entity
+     */
+    UserEntity findByEmail(String email);
+    
+    /**
+     * Find tenant admin users by tenantId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param pageLink the page link
+     * @return the list of user entities
+     */
+    List<UserEntity> findTenantAdmins(UUID tenantId, TextPageLink pageLink);
+    
+    /**
+     * Find customer users by tenantId, customerId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param customerId the customerId
+     * @param pageLink the page link
+     * @return the list of user entities
+     */
+    List<UserEntity> findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink);
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserDaoImpl.java
new file mode 100644
index 0000000..16f73fe
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserDaoImpl.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.user;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.UserEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.datastax.driver.core.querybuilder.Select.Where;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+@Component
+@Slf4j
+public class UserDaoImpl extends AbstractSearchTextDao<UserEntity> implements UserDao {
+
+    @Override
+    protected Class<UserEntity> getColumnFamilyClass() {
+        return UserEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return ModelConstants.USER_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public UserEntity findByEmail(String email) {
+        log.debug("Try to find user by email [{}] ", email);
+        Where query = select().from(ModelConstants.USER_BY_EMAIL_COLUMN_FAMILY_NAME).where(eq(ModelConstants.USER_EMAIL_PROPERTY, email));
+        log.trace("Execute query {}", query);
+        UserEntity userEntity = findOneByStatement(query);
+        log.trace("Found user [{}] by email [{}]", userEntity, email);
+        return userEntity;
+    }
+
+    @Override
+    public UserEntity save(User user) {
+        log.debug("Save user [{}] ", user);
+        return save(new UserEntity(user));
+    }
+
+    @Override
+    public List<UserEntity> findTenantAdmins(UUID tenantId, TextPageLink pageLink) {
+        log.debug("Try to find tenant admin users by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<UserEntity> userEntities = findPageWithTextSearch(ModelConstants.USER_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(ModelConstants.USER_TENANT_ID_PROPERTY, tenantId),
+                              eq(ModelConstants.USER_CUSTOMER_ID_PROPERTY, ModelConstants.NULL_UUID),
+                              eq(ModelConstants.USER_AUTHORITY_PROPERTY, Authority.TENANT_ADMIN.name())),
+                pageLink); 
+        log.trace("Found tenant admin users [{}] by tenantId [{}] and pageLink [{}]", userEntities, tenantId, pageLink);
+        return userEntities;
+    }
+
+    @Override
+    public List<UserEntity> findCustomerUsers(UUID tenantId, UUID customerId, TextPageLink pageLink) {
+        log.debug("Try to find customer users by tenantId [{}], customerId [{}] and pageLink [{}]", tenantId, customerId, pageLink);
+        List<UserEntity> userEntities = findPageWithTextSearch(ModelConstants.USER_BY_CUSTOMER_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(ModelConstants.USER_TENANT_ID_PROPERTY, tenantId),
+                              eq(ModelConstants.USER_CUSTOMER_ID_PROPERTY, customerId),
+                              eq(ModelConstants.USER_AUTHORITY_PROPERTY, Authority.CUSTOMER_USER.name())),
+                pageLink); 
+        log.trace("Found customer users [{}] by tenantId [{}], customerId [{}] and pageLink [{}]", userEntities, tenantId, customerId, pageLink);
+        return userEntities;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserService.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserService.java
new file mode 100644
index 0000000..1ad77c9
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserService.java
@@ -0,0 +1,56 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.user;
+
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.UserCredentials;
+
+public interface UserService {
+	
+	public User findUserById(UserId userId);
+
+	public User findUserByEmail(String email);
+	
+	public User saveUser(User user);
+
+	public UserCredentials findUserCredentialsByUserId(UserId userId);	
+	
+	public UserCredentials findUserCredentialsByActivateToken(String activateToken);
+
+	public UserCredentials findUserCredentialsByResetToken(String resetToken);
+
+	public UserCredentials saveUserCredentials(UserCredentials userCredentials);
+	
+	public UserCredentials activateUserCredentials(String activateToken, String password);
+	
+	public UserCredentials requestPasswordReset(String email);
+
+	public void deleteUser(UserId userId);
+	
+	public TextPageData<User> findTenantAdmins(TenantId tenantId, TextPageLink pageLink);
+	
+	public void deleteTenantAdmins(TenantId tenantId);
+	
+	public TextPageData<User> findCustomerUsers(TenantId tenantId, CustomerId customerId, TextPageLink pageLink);
+	    
+	public void deleteCustomerUsers(TenantId tenantId, CustomerId customerId);
+	
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
new file mode 100644
index 0000000..17784d1
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/user/UserServiceImpl.java
@@ -0,0 +1,352 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.user;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+import static org.thingsboard.server.dao.service.Validator.validateId;
+import static org.thingsboard.server.dao.service.Validator.validatePageLink;
+import static org.thingsboard.server.dao.service.Validator.validateString;
+
+import java.util.List;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.dao.customer.CustomerDao;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.*;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.tenant.TenantDao;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class UserServiceImpl implements UserService {
+
+    @Autowired
+    private UserDao userDao;
+    
+    @Autowired
+    private UserCredentialsDao userCredentialsDao;
+    
+    @Autowired
+    private TenantDao tenantDao;
+    
+    @Autowired
+    private CustomerDao customerDao;
+    
+	@Override
+	public User findUserByEmail(String email) {
+	    log.trace("Executing findUserByEmail [{}]", email);
+		validateString(email, "Incorrect email " + email);
+		UserEntity userEntity = userDao.findByEmail(email);
+		return getData(userEntity);
+	}
+
+	@Override
+	public User findUserById(UserId userId) {
+	    log.trace("Executing findUserById [{}]", userId);
+		validateId(userId, "Incorrect userId " + userId);
+		UserEntity userEntity = userDao.findById(userId.getId());
+		return getData(userEntity);
+	}
+
+    @Override
+    public User saveUser(User user) {
+        log.trace("Executing saveUser [{}]", user);
+        userValidator.validate(user);
+        UserEntity userEntity = userDao.save(user);
+        if (user.getId() == null) {
+            UserCredentials userCredentials = new UserCredentials();
+            userCredentials.setEnabled(false);
+            userCredentials.setActivateToken(RandomStringUtils.randomAlphanumeric(30));
+            userCredentials.setUserId(new UserId(userEntity.getId()));
+            userCredentialsDao.save(userCredentials);
+        }        
+        return getData(userEntity);
+    }
+    
+    @Override
+    public UserCredentials findUserCredentialsByUserId(UserId userId) {
+        log.trace("Executing findUserCredentialsByUserId [{}]", userId);
+        validateId(userId, "Incorrect userId " + userId);
+        UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByUserId(userId.getId());
+        return getData(userCredentialsEntity);
+    }
+
+    @Override
+    public UserCredentials findUserCredentialsByActivateToken(String activateToken) {
+        log.trace("Executing findUserCredentialsByActivateToken [{}]", activateToken);
+        validateString(activateToken, "Incorrect activateToken " + activateToken);
+        UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByActivateToken(activateToken);
+        return getData(userCredentialsEntity);
+    }
+
+    @Override
+    public UserCredentials findUserCredentialsByResetToken(String resetToken) {
+        log.trace("Executing findUserCredentialsByResetToken [{}]", resetToken);
+        validateString(resetToken, "Incorrect resetToken " + resetToken);
+        UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByResetToken(resetToken);
+        return getData(userCredentialsEntity);
+    }
+
+    @Override
+    public UserCredentials saveUserCredentials(UserCredentials userCredentials) {
+        log.trace("Executing saveUserCredentials [{}]", userCredentials);
+        userCredentialsValidator.validate(userCredentials);
+        UserCredentialsEntity userCredentialsEntity = userCredentialsDao.save(userCredentials);
+        return getData(userCredentialsEntity);
+    }
+    
+    @Override
+    public UserCredentials activateUserCredentials(String activateToken, String password) {
+        log.trace("Executing activateUserCredentials activateToken [{}], password [{}]", activateToken, password);
+        validateString(activateToken, "Incorrect activateToken " + activateToken);
+        validateString(password, "Incorrect password " + password);
+        UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByActivateToken(activateToken);
+        if (userCredentialsEntity == null) {
+            throw new IncorrectParameterException(String.format("Unable to find user credentials by activateToken [%s]", activateToken));
+        }
+        UserCredentials userCredentials = getData(userCredentialsEntity);
+        if (userCredentials.isEnabled()) {
+            throw new IncorrectParameterException("User credentials already activated");
+        }
+        userCredentials.setEnabled(true);
+        userCredentials.setActivateToken(null);
+        userCredentials.setPassword(password);
+        
+        return saveUserCredentials(userCredentials);
+    }
+
+    @Override
+    public UserCredentials requestPasswordReset(String email) {
+        log.trace("Executing requestPasswordReset email [{}]", email);
+        validateString(email, "Incorrect email " + email);
+        UserEntity userEntity = userDao.findByEmail(email);
+        if (userEntity == null) {
+            throw new IncorrectParameterException(String.format("Unable to find user by email [%s]", email));
+        }
+        UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByUserId(userEntity.getId());
+        UserCredentials userCredentials = getData(userCredentialsEntity);
+        if (!userCredentials.isEnabled()) {
+            throw new IncorrectParameterException("Unable to reset password for unactive user");
+        }
+        userCredentials.setResetToken(RandomStringUtils.randomAlphanumeric(30));
+        return saveUserCredentials(userCredentials);
+    }
+
+
+    @Override
+    public void deleteUser(UserId userId) {
+        log.trace("Executing deleteUser [{}]", userId);
+        validateId(userId, "Incorrect userId " + userId);
+        UserCredentialsEntity userCredentialsEntity = userCredentialsDao.findByUserId(userId.getId());
+        userCredentialsDao.removeById(userCredentialsEntity.getId());
+        userDao.removeById(userId.getId());
+    }
+
+    @Override
+    public TextPageData<User> findTenantAdmins(TenantId tenantId, TextPageLink pageLink) {
+        log.trace("Executing findTenantAdmins, tenantId [{}], pageLink [{}]", tenantId, pageLink);
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<UserEntity> userEntities = userDao.findTenantAdmins(tenantId.getId(), pageLink);
+        List<User> users = convertDataList(userEntities);
+        return new TextPageData<User>(users, pageLink);
+    }
+
+    @Override
+    public void deleteTenantAdmins(TenantId tenantId) {
+        log.trace("Executing deleteTenantAdmins, tenantId [{}]", tenantId);
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        tenantAdminsRemover.removeEntitites(tenantId);
+    }
+
+    @Override
+    public TextPageData<User> findCustomerUsers(TenantId tenantId, CustomerId customerId, TextPageLink pageLink) {
+        log.trace("Executing findCustomerUsers, tenantId [{}], customerId [{}], pageLink [{}]", tenantId, customerId, pageLink);
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        validateId(customerId, "Incorrect customerId " + customerId);
+        validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<UserEntity> userEntities = userDao.findCustomerUsers(tenantId.getId(), customerId.getId(), pageLink);
+        List<User> users = convertDataList(userEntities);
+        return new TextPageData<User>(users, pageLink);
+    }
+
+    @Override
+    public void deleteCustomerUsers(TenantId tenantId, CustomerId customerId) {
+        log.trace("Executing deleteCustomerUsers, customerId [{}]", customerId);
+        validateId(tenantId, "Incorrect tenantId " + tenantId);
+        validateId(customerId, "Incorrect customerId " + customerId);
+        new CustomerUsersRemover(tenantId).removeEntitites(customerId);
+    }
+
+    private DataValidator<User> userValidator =
+            new DataValidator<User>() {
+                @Override
+                protected void validateDataImpl(User user) {
+                    if (StringUtils.isEmpty(user.getEmail())) {
+                        throw new DataValidationException("User email should be specified!");
+                    }
+                    
+                    validateEmail(user.getEmail());
+                    
+                    Authority authority = user.getAuthority();
+                    if (authority == null) {
+                        throw new DataValidationException("User authority isn't defined!");
+                    }
+                    TenantId tenantId = user.getTenantId();
+                    if (tenantId == null) {
+                        tenantId = new TenantId(ModelConstants.NULL_UUID);
+                        user.setTenantId(tenantId);
+                    }
+                    CustomerId customerId = user.getCustomerId();
+                    if (customerId == null) {
+                        customerId = new CustomerId(ModelConstants.NULL_UUID);
+                        user.setCustomerId(customerId);
+                    }
+                    
+                    switch (authority) {
+                        case SYS_ADMIN:
+                            if (user.getId() == null) {
+                                throw new DataValidationException("Creation of system administrator is prohibited!");
+                            }
+                            if (!tenantId.getId().equals(ModelConstants.NULL_UUID)
+                                    || !customerId.getId().equals(ModelConstants.NULL_UUID)) {
+                                    throw new DataValidationException("System administrator can't be assigned neither to tenant nor to customer!");
+                            }
+                            break;
+                        case TENANT_ADMIN:
+                            if (tenantId.getId().equals(ModelConstants.NULL_UUID)) {
+                                throw new DataValidationException("Tenant administrator should be assigned to tenant!");
+                            } else if (!customerId.getId().equals(ModelConstants.NULL_UUID)) {
+                                throw new DataValidationException("Tenant administrator can't be assigned to customer!");
+                            }
+                            break;
+                        case CUSTOMER_USER:
+                            if (tenantId.getId().equals(ModelConstants.NULL_UUID)
+                                || customerId.getId().equals(ModelConstants.NULL_UUID) ) {
+                                throw new DataValidationException("Customer user should be assigned to customer!");
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                    
+                    User existentUserWithEmail = findUserByEmail(user.getEmail());
+                    if (existentUserWithEmail != null && !isSameData(existentUserWithEmail, user)) {
+                        throw new DataValidationException("User with email '" + user.getEmail() + "' "
+                                + " already present in database!");
+                    }
+                    if (!tenantId.getId().equals(ModelConstants.NULL_UUID)) {
+                        TenantEntity tenant = tenantDao.findById(user.getTenantId().getId());
+                        if (tenant == null) {
+                            throw new DataValidationException("User is referencing to non-existent tenant!");
+                        }
+                    }
+                    if (!customerId.getId().equals(ModelConstants.NULL_UUID)) {
+                        CustomerEntity customer = customerDao.findById(user.getCustomerId().getId());
+                        if (customer == null) {
+                            throw new DataValidationException("User is referencing to non-existent customer!");
+                        } else if (!customer.getTenantId().equals(tenantId.getId())) {
+                            throw new DataValidationException("User can't be assigned to customer from different tenant!");
+                        }
+                    }
+                 }
+    };
+    
+    private DataValidator<UserCredentials> userCredentialsValidator = 
+            new DataValidator<UserCredentials>() {
+        
+                @Override
+                protected void validateCreate(UserCredentials userCredentials) {
+                    throw new IncorrectParameterException("Creation of new user credentials is prohibited.");
+                }
+                
+                @Override
+                protected void validateDataImpl(UserCredentials userCredentials) {
+                    if (userCredentials.getUserId() == null) {
+                        throw new DataValidationException("User credentials should be assigned to user!");
+                    }
+                    if (userCredentials.isEnabled()) {
+                        if (StringUtils.isEmpty(userCredentials.getPassword())) {
+                            throw new DataValidationException("Enabled user credentials should have password!");
+                        }
+                        if (StringUtils.isNotEmpty(userCredentials.getActivateToken())) {
+                            throw new DataValidationException("Enabled user credentials can't have activate token!");
+                        }
+                    }
+                    UserCredentialsEntity existingUserCredentialsEntity = userCredentialsDao.findById(userCredentials.getId().getId());
+                    if (existingUserCredentialsEntity == null) {
+                        throw new DataValidationException("Unable to update non-existent user credentials!");
+                    }
+                    User user = findUserById(userCredentials.getUserId());
+                    if (user == null) {
+                        throw new DataValidationException("Can't assign user credentials to non-existent user!");
+                    }
+                }
+    };
+    
+    private PaginatedRemover<TenantId, UserEntity> tenantAdminsRemover =
+            new PaginatedRemover<TenantId, UserEntity>() {
+        
+        @Override
+        protected List<UserEntity> findEntities(TenantId id, TextPageLink pageLink) {
+            return userDao.findTenantAdmins(id.getId(), pageLink);
+        }
+
+        @Override
+        protected void removeEntity(UserEntity entity) {
+            deleteUser(new UserId(entity.getId()));
+        }
+    };
+    
+    class CustomerUsersRemover extends PaginatedRemover<CustomerId, UserEntity> {
+        
+        private TenantId tenantId;
+        
+        CustomerUsersRemover(TenantId tenantId) {
+            this.tenantId = tenantId;
+        }
+
+        @Override
+        protected List<UserEntity> findEntities(CustomerId id, TextPageLink pageLink) {
+            return userDao.findCustomerUsers(tenantId.getId(), id.getId(), pageLink);
+ 
+        }
+
+        @Override
+        protected void removeEntity(UserEntity entity) {
+            deleteUser(new UserId(entity.getId()));
+        }
+        
+    }
+    
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDao.java
new file mode 100644
index 0000000..d047d7d
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDao.java
@@ -0,0 +1,77 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.widget;
+
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.WidgetsBundleEntity;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * The Interface WidgetsBundleDao.
+ *
+ * @param <T> the generic type
+ */
+public interface WidgetsBundleDao extends Dao<WidgetsBundleEntity> {
+
+    /**
+     * Save or update widgets bundle object
+     *
+     * @param widgetsBundle the widgets bundle object
+     * @return saved widgets bundle object
+     */
+    WidgetsBundleEntity save(WidgetsBundle widgetsBundle);
+
+    /**
+     * Find widgets bundle by tenantId and alias.
+     *
+     * @param tenantId the tenantId
+     * @param alias the alias
+     * @return the widgets bundle object
+     */
+    WidgetsBundleEntity findWidgetsBundleByTenantIdAndAlias(UUID tenantId, String alias);
+
+    /**
+     * Find system widgets bundles by page link.
+     *
+     * @param pageLink the page link
+     * @return the list of widgets bundles objects
+     */
+    List<WidgetsBundleEntity> findSystemWidgetsBundles(TextPageLink pageLink);
+
+    /**
+     * Find tenant widgets bundles by tenantId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param pageLink the page link
+     * @return the list of widgets bundles objects
+     */
+    List<WidgetsBundleEntity> findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink);
+
+    /**
+     * Find all tenant widgets bundles (including system) by tenantId and page link.
+     *
+     * @param tenantId the tenantId
+     * @param pageLink the page link
+     * @return the list of widgets bundles objects
+     */
+    List<WidgetsBundleEntity> findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink);
+
+}
+

diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDaoImpl.java
new file mode 100644
index 0000000..3de8bd3
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleDaoImpl.java
@@ -0,0 +1,101 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.widget;
+
+import com.datastax.driver.core.querybuilder.Select;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.AbstractSearchTextDao;
+import org.thingsboard.server.dao.model.WidgetsBundleEntity;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.in;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+import static org.thingsboard.server.dao.model.ModelConstants.*;
+
+@Component
+@Slf4j
+public class WidgetsBundleDaoImpl extends AbstractSearchTextDao<WidgetsBundleEntity> implements WidgetsBundleDao {
+
+    @Override
+    protected Class<WidgetsBundleEntity> getColumnFamilyClass() {
+        return WidgetsBundleEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return WIDGETS_BUNDLE_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public WidgetsBundleEntity save(WidgetsBundle widgetsBundle) {
+        log.debug("Save widgets bundle [{}] ", widgetsBundle);
+        return save(new WidgetsBundleEntity(widgetsBundle));
+    }
+
+    @Override
+    public WidgetsBundleEntity findWidgetsBundleByTenantIdAndAlias(UUID tenantId, String alias) {
+        log.debug("Try to find widgets bundle by tenantId [{}] and alias [{}]", tenantId, alias);
+        Select.Where query = select().from(WIDGETS_BUNDLE_BY_TENANT_AND_ALIAS_COLUMN_FAMILY_NAME)
+                .where()
+                .and(eq(WIDGETS_BUNDLE_TENANT_ID_PROPERTY, tenantId))
+                .and(eq(WIDGETS_BUNDLE_ALIAS_PROPERTY, alias));
+        log.trace("Execute query {}", query);
+        WidgetsBundleEntity widgetsBundleEntity = findOneByStatement(query);
+        log.trace("Found widgets bundle [{}] by tenantId [{}] and alias [{}]",
+                widgetsBundleEntity, tenantId, alias);
+        return widgetsBundleEntity;
+    }
+
+    @Override
+    public List<WidgetsBundleEntity> findSystemWidgetsBundles(TextPageLink pageLink) {
+        log.debug("Try to find system widgets bundles by pageLink [{}]", pageLink);
+        List<WidgetsBundleEntity> widgetsBundlesEntities = findPageWithTextSearch(WIDGETS_BUNDLE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(WIDGETS_BUNDLE_TENANT_ID_PROPERTY, NULL_UUID)),
+                pageLink);
+        log.trace("Found system widgets bundles [{}] by pageLink [{}]", widgetsBundlesEntities, pageLink);
+        return widgetsBundlesEntities;
+    }
+
+    @Override
+    public List<WidgetsBundleEntity> findTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) {
+        log.debug("Try to find tenant widgets bundles by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<WidgetsBundleEntity> widgetsBundlesEntities = findPageWithTextSearch(WIDGETS_BUNDLE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(eq(WIDGETS_BUNDLE_TENANT_ID_PROPERTY, tenantId)),
+                pageLink);
+        log.trace("Found tenant widgets bundles [{}] by tenantId [{}] and pageLink [{}]", widgetsBundlesEntities, tenantId, pageLink);
+        return widgetsBundlesEntities;
+    }
+
+    @Override
+    public List<WidgetsBundleEntity> findAllTenantWidgetsBundlesByTenantId(UUID tenantId, TextPageLink pageLink) {
+        log.debug("Try to find all tenant widgets bundles by tenantId [{}] and pageLink [{}]", tenantId, pageLink);
+        List<WidgetsBundleEntity> widgetsBundlesEntities = findPageWithTextSearch(WIDGETS_BUNDLE_BY_TENANT_AND_SEARCH_TEXT_COLUMN_FAMILY_NAME,
+                Arrays.asList(in(WIDGETS_BUNDLE_TENANT_ID_PROPERTY, Arrays.asList(NULL_UUID, tenantId))),
+                pageLink);
+        log.trace("Found all tenant widgets bundles [{}] by tenantId [{}] and pageLink [{}]", widgetsBundlesEntities, tenantId, pageLink);
+        return widgetsBundlesEntities;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java
new file mode 100644
index 0000000..ac316e9
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleService.java
@@ -0,0 +1,48 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.widget;
+
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.WidgetsBundleId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+
+import java.util.List;
+
+public interface WidgetsBundleService {
+
+    public WidgetsBundle findWidgetsBundleById(WidgetsBundleId widgetsBundleId);
+
+    public WidgetsBundle saveWidgetsBundle(WidgetsBundle widgetsBundle);
+
+    public void deleteWidgetsBundle(WidgetsBundleId widgetsBundleId);
+
+    public WidgetsBundle findWidgetsBundleByTenantIdAndAlias(TenantId tenantId, String alias);
+
+    public TextPageData<WidgetsBundle> findSystemWidgetsBundlesByPageLink(TextPageLink pageLink);
+
+    public List<WidgetsBundle> findSystemWidgetsBundles();
+
+    public TextPageData<WidgetsBundle> findTenantWidgetsBundlesByTenantId(TenantId tenantId, TextPageLink pageLink);
+
+    public TextPageData<WidgetsBundle> findAllTenantWidgetsBundlesByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink);
+
+    public List<WidgetsBundle> findAllTenantWidgetsBundlesByTenantId(TenantId tenantId);
+
+    public void deleteWidgetsBundlesByTenantId(TenantId tenantId);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
new file mode 100644
index 0000000..8f1d0ed
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetsBundleServiceImpl.java
@@ -0,0 +1,225 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.widget;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.WidgetsBundleId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.exception.IncorrectParameterException;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.model.TenantEntity;
+import org.thingsboard.server.dao.model.WidgetsBundleEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.PaginatedRemover;
+import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.tenant.TenantDao;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+
+@Service
+@Slf4j
+public class WidgetsBundleServiceImpl implements WidgetsBundleService {
+
+    @Autowired
+    private WidgetsBundleDao widgetsBundleDao;
+
+    @Autowired
+    private TenantDao tenantDao;
+
+    @Autowired
+    private WidgetTypeService widgetTypeService;
+
+    @Override
+    public WidgetsBundle findWidgetsBundleById(WidgetsBundleId widgetsBundleId) {
+        log.trace("Executing findWidgetsBundleById [{}]", widgetsBundleId);
+        Validator.validateId(widgetsBundleId, "Incorrect widgetsBundleId " + widgetsBundleId);
+        WidgetsBundleEntity widgetsBundleEntity = widgetsBundleDao.findById(widgetsBundleId.getId());
+        return getData(widgetsBundleEntity);
+    }
+
+    @Override
+    public WidgetsBundle saveWidgetsBundle(WidgetsBundle widgetsBundle) {
+        log.trace("Executing saveWidgetsBundle [{}]", widgetsBundle);
+        widgetsBundleValidator.validate(widgetsBundle);
+        WidgetsBundleEntity widgetsBundleEntity = widgetsBundleDao.save(widgetsBundle);
+        return getData(widgetsBundleEntity);
+    }
+
+    @Override
+    public void deleteWidgetsBundle(WidgetsBundleId widgetsBundleId) {
+        log.trace("Executing deleteWidgetsBundle [{}]", widgetsBundleId);
+        Validator.validateId(widgetsBundleId, "Incorrect widgetsBundleId " + widgetsBundleId);
+        WidgetsBundle widgetsBundle = findWidgetsBundleById(widgetsBundleId);
+        if (widgetsBundle == null) {
+            throw new IncorrectParameterException("Unable to delete non-existent widgets bundle.");
+        }
+        widgetTypeService.deleteWidgetTypesByTenantIdAndBundleAlias(widgetsBundle.getTenantId(), widgetsBundle.getAlias());
+        widgetsBundleDao.removeById(widgetsBundleId.getId());
+    }
+
+    @Override
+    public WidgetsBundle findWidgetsBundleByTenantIdAndAlias(TenantId tenantId, String alias) {
+        log.trace("Executing findWidgetsBundleByTenantIdAndAlias, tenantId [{}], alias [{}]", tenantId, alias);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateString(alias, "Incorrect alias " + alias);
+        WidgetsBundleEntity widgetsBundleEntity = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(tenantId.getId(), alias);
+        return getData(widgetsBundleEntity);
+    }
+
+    @Override
+    public TextPageData<WidgetsBundle> findSystemWidgetsBundlesByPageLink(TextPageLink pageLink) {
+        log.trace("Executing findSystemWidgetsBundles, pageLink [{}]", pageLink);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<WidgetsBundleEntity> widgetsBundlesEntities = widgetsBundleDao.findSystemWidgetsBundles(pageLink);
+        List<WidgetsBundle> widgetsBundles = convertDataList(widgetsBundlesEntities);
+        return new TextPageData<>(widgetsBundles, pageLink);
+    }
+
+    @Override
+    public List<WidgetsBundle> findSystemWidgetsBundles() {
+        log.trace("Executing findSystemWidgetsBundles");
+        List<WidgetsBundle> widgetsBundles = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(300);
+        TextPageData<WidgetsBundle> pageData = null;
+        do {
+            pageData = findSystemWidgetsBundlesByPageLink(pageLink);
+            widgetsBundles.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        return widgetsBundles;
+    }
+
+    @Override
+    public TextPageData<WidgetsBundle> findTenantWidgetsBundlesByTenantId(TenantId tenantId, TextPageLink pageLink) {
+        log.trace("Executing findTenantWidgetsBundlesByTenantId, tenantId [{}], pageLink [{}]", tenantId, pageLink);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<WidgetsBundleEntity> widgetsBundlesEntities = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId.getId(), pageLink);
+        List<WidgetsBundle> widgetsBundles = convertDataList(widgetsBundlesEntities);
+        return new TextPageData<>(widgetsBundles, pageLink);
+    }
+
+    @Override
+    public TextPageData<WidgetsBundle> findAllTenantWidgetsBundlesByTenantIdAndPageLink(TenantId tenantId, TextPageLink pageLink) {
+        log.trace("Executing findAllTenantWidgetsBundlesByTenantIdAndPageLink, tenantId [{}], pageLink [{}]", tenantId, pageLink);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validatePageLink(pageLink, "Incorrect page link " + pageLink);
+        List<WidgetsBundleEntity> widgetsBundlesEntities = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId.getId(), pageLink);
+        List<WidgetsBundle> widgetsBundles = convertDataList(widgetsBundlesEntities);
+        return new TextPageData<>(widgetsBundles, pageLink);
+    }
+
+    @Override
+    public List<WidgetsBundle> findAllTenantWidgetsBundlesByTenantId(TenantId tenantId) {
+        log.trace("Executing findAllTenantWidgetsBundlesByTenantId, tenantId [{}]", tenantId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        List<WidgetsBundle> widgetsBundles = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(300);
+        TextPageData<WidgetsBundle> pageData = null;
+        do {
+            pageData = findAllTenantWidgetsBundlesByTenantIdAndPageLink(tenantId, pageLink);
+            widgetsBundles.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        return widgetsBundles;
+    }
+
+    @Override
+    public void deleteWidgetsBundlesByTenantId(TenantId tenantId) {
+        log.trace("Executing deleteWidgetsBundlesByTenantId, tenantId [{}]", tenantId);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        tenantWidgetsBundleRemover.removeEntitites(tenantId);
+    }
+
+    private DataValidator<WidgetsBundle> widgetsBundleValidator =
+            new DataValidator<WidgetsBundle>() {
+
+                @Override
+                protected void validateDataImpl(WidgetsBundle widgetsBundle) {
+                    if (StringUtils.isEmpty(widgetsBundle.getTitle())) {
+                        throw new DataValidationException("Widgets bundle title should be specified!");
+                    }
+                    if (widgetsBundle.getTenantId() == null) {
+                        widgetsBundle.setTenantId(new TenantId(ModelConstants.NULL_UUID));
+                    }
+                    if (!widgetsBundle.getTenantId().getId().equals(ModelConstants.NULL_UUID)) {
+                        TenantEntity tenant = tenantDao.findById(widgetsBundle.getTenantId().getId());
+                        if (tenant == null) {
+                            throw new DataValidationException("Widgets bundle is referencing to non-existent tenant!");
+                        }
+                    }
+                }
+
+                @Override
+                protected void validateCreate(WidgetsBundle widgetsBundle) {
+                    String alias = widgetsBundle.getTitle().toLowerCase().replaceAll("\\W+", "_");
+                    String originalAlias = alias;
+                    int c = 1;
+                    WidgetsBundleEntity withSameAlias;
+                    do {
+                        withSameAlias = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(widgetsBundle.getTenantId().getId(), alias);
+                        if (withSameAlias != null) {
+                            alias = originalAlias + (++c);
+                        }
+                    } while(withSameAlias != null);
+                    widgetsBundle.setAlias(alias);
+                }
+
+                @Override
+                protected void validateUpdate(WidgetsBundle widgetsBundle) {
+                    WidgetsBundleEntity storedWidgetsBundle = widgetsBundleDao.findById(widgetsBundle.getId().getId());
+                    if (!storedWidgetsBundle.getTenantId().equals(widgetsBundle.getTenantId().getId())) {
+                        throw new DataValidationException("Can't move existing widgets bundle to different tenant!");
+                    }
+                    if (!storedWidgetsBundle.getAlias().equals(widgetsBundle.getAlias())) {
+                        throw new DataValidationException("Update of widgets bundle alias is prohibited!");
+                    }
+                }
+
+            };
+
+    private PaginatedRemover<TenantId, WidgetsBundleEntity> tenantWidgetsBundleRemover =
+            new PaginatedRemover<TenantId, WidgetsBundleEntity>() {
+
+                @Override
+                protected List<WidgetsBundleEntity> findEntities(TenantId id, TextPageLink pageLink) {
+                    return widgetsBundleDao.findTenantWidgetsBundlesByTenantId(id.getId(), pageLink);
+                }
+
+                @Override
+                protected void removeEntity(WidgetsBundleEntity entity) {
+                    deleteWidgetsBundle(new WidgetsBundleId(entity.getId()));
+                }
+            };
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java
new file mode 100644
index 0000000..8f98a64
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDao.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.widget;
+
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.dao.Dao;
+import org.thingsboard.server.dao.model.WidgetTypeEntity;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * The Interface WidgetTypeDao.
+ *
+ * @param <T> the generic type
+ */
+public interface WidgetTypeDao extends Dao<WidgetTypeEntity> {
+
+    /**
+     * Save or update widget type object
+     *
+     * @param widgetType the widget type object
+     * @return saved widget type object
+     */
+    WidgetTypeEntity save(WidgetType widgetType);
+
+    /**
+     * Find widget types by tenantId and bundleAlias.
+     *
+     * @param tenantId the tenantId
+     * @param bundleAlias the bundle alias
+     * @return the list of widget types objects
+     */
+    List<WidgetTypeEntity> findWidgetTypesByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias);
+
+    /**
+     * Find widget type by tenantId, bundleAlias and alias.
+     *
+     * @param tenantId the tenantId
+     * @param bundleAlias the bundle alias
+     * @param alias the alias
+     * @return the widget type object
+     */
+    WidgetTypeEntity findByTenantIdBundleAliasAndAlias(UUID tenantId, String bundleAlias, String alias);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDaoImpl.java
new file mode 100644
index 0000000..ced1830
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeDaoImpl.java
@@ -0,0 +1,82 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.widget;
+
+import com.datastax.driver.core.querybuilder.Select.Where;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.stereotype.Repository;
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.dao.AbstractModelDao;
+import org.thingsboard.server.dao.model.WidgetTypeEntity;
+
+import java.util.List;
+import java.util.UUID;
+
+import static com.datastax.driver.core.querybuilder.QueryBuilder.eq;
+import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
+import static org.thingsboard.server.dao.model.ModelConstants.*;
+
+@Component
+@Slf4j
+public class WidgetTypeDaoImpl extends AbstractModelDao<WidgetTypeEntity> implements WidgetTypeDao {
+
+    @Override
+    protected Class<WidgetTypeEntity> getColumnFamilyClass() {
+        return WidgetTypeEntity.class;
+    }
+
+    @Override
+    protected String getColumnFamilyName() {
+        return WIDGET_TYPE_COLUMN_FAMILY_NAME;
+    }
+
+    @Override
+    public WidgetTypeEntity save(WidgetType widgetType) {
+        log.debug("Save widget type [{}] ", widgetType);
+        return save(new WidgetTypeEntity(widgetType));
+    }
+
+    @Override
+    public List<WidgetTypeEntity> findWidgetTypesByTenantIdAndBundleAlias(UUID tenantId, String bundleAlias) {
+        log.debug("Try to find widget types by tenantId [{}] and bundleAlias [{}]", tenantId, bundleAlias);
+        Where query = select().from(WIDGET_TYPE_BY_TENANT_AND_ALIASES_COLUMN_FAMILY_NAME)
+                .where()
+                .and(eq(WIDGET_TYPE_TENANT_ID_PROPERTY, tenantId))
+                .and(eq(WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY, bundleAlias));
+        List<WidgetTypeEntity> widgetTypesEntities = findListByStatement(query);
+        log.trace("Found widget types [{}] by tenantId [{}] and bundleAlias [{}]", widgetTypesEntities, tenantId, bundleAlias);
+        return widgetTypesEntities;
+    }
+
+    @Override
+    public WidgetTypeEntity findByTenantIdBundleAliasAndAlias(UUID tenantId, String bundleAlias, String alias) {
+        log.debug("Try to find widget type by tenantId [{}], bundleAlias [{}] and alias [{}]", tenantId, bundleAlias, alias);
+        Where query = select().from(WIDGET_TYPE_BY_TENANT_AND_ALIASES_COLUMN_FAMILY_NAME)
+                .where()
+                .and(eq(WIDGET_TYPE_TENANT_ID_PROPERTY, tenantId))
+                .and(eq(WIDGET_TYPE_BUNDLE_ALIAS_PROPERTY, bundleAlias))
+                .and(eq(WIDGET_TYPE_ALIAS_PROPERTY, alias));
+        log.trace("Execute query {}", query);
+        WidgetTypeEntity widgetTypeEntity = findOneByStatement(query);
+        log.trace("Found widget type [{}] by tenantId [{}], bundleAlias [{}] and alias [{}]",
+                widgetTypeEntity, tenantId, bundleAlias, alias);
+        return widgetTypeEntity;
+    }
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java
new file mode 100644
index 0000000..a3c8967
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeService.java
@@ -0,0 +1,38 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.widget;
+
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.WidgetTypeId;
+import org.thingsboard.server.common.data.widget.WidgetType;
+
+import java.util.List;
+
+public interface WidgetTypeService {
+
+    public WidgetType findWidgetTypeById(WidgetTypeId widgetTypeId);
+
+    public WidgetType saveWidgetType(WidgetType widgetType);
+
+    public void deleteWidgetType(WidgetTypeId widgetTypeId);
+
+    public List<WidgetType> findWidgetTypesByTenantIdAndBundleAlias(TenantId tenantId, String bundleAlias);
+
+    public WidgetType findWidgetTypeByTenantIdBundleAliasAndAlias(TenantId tenantId, String bundleAlias, String alias);
+
+    public void deleteWidgetTypesByTenantIdAndBundleAlias(TenantId tenantId, String bundleAlias);
+
+}

diff --git a/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
new file mode 100644
index 0000000..97f5048
--- /dev/null
+++ b/dao/src/main/java/org/thingsboard/server/dao/widget/WidgetTypeServiceImpl.java
@@ -0,0 +1,169 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.widget;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.WidgetTypeId;
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.model.TenantEntity;
+import org.thingsboard.server.dao.model.WidgetTypeEntity;
+import org.thingsboard.server.dao.model.WidgetsBundleEntity;
+import org.thingsboard.server.dao.service.DataValidator;
+import org.thingsboard.server.dao.service.Validator;
+import org.thingsboard.server.dao.tenant.TenantDao;
+import org.thingsboard.server.dao.tenant.TenantService;
+
+import java.util.List;
+
+import static org.thingsboard.server.dao.DaoUtil.convertDataList;
+import static org.thingsboard.server.dao.DaoUtil.getData;
+
+@Service
+@Slf4j
+public class WidgetTypeServiceImpl implements WidgetTypeService {
+
+    @Autowired
+    private WidgetTypeDao widgetTypeDao;
+
+    @Autowired
+    private TenantDao tenantDao;
+
+    @Autowired
+    private WidgetsBundleDao widgetsBundleService;
+
+    @Override
+    public WidgetType findWidgetTypeById(WidgetTypeId widgetTypeId) {
+        log.trace("Executing findWidgetTypeById [{}]", widgetTypeId);
+        Validator.validateId(widgetTypeId, "Incorrect widgetTypeId " + widgetTypeId);
+        WidgetTypeEntity widgetTypeEntity = widgetTypeDao.findById(widgetTypeId.getId());
+        return getData(widgetTypeEntity);
+    }
+
+    @Override
+    public WidgetType saveWidgetType(WidgetType widgetType) {
+        log.trace("Executing saveWidgetType [{}]", widgetType);
+        widgetTypeValidator.validate(widgetType);
+        WidgetTypeEntity widgetTypeEntity = widgetTypeDao.save(widgetType);
+        return getData(widgetTypeEntity);
+    }
+
+    @Override
+    public void deleteWidgetType(WidgetTypeId widgetTypeId) {
+        log.trace("Executing deleteWidgetType [{}]", widgetTypeId);
+        Validator.validateId(widgetTypeId, "Incorrect widgetTypeId " + widgetTypeId);
+        widgetTypeDao.removeById(widgetTypeId.getId());
+    }
+
+    @Override
+    public List<WidgetType> findWidgetTypesByTenantIdAndBundleAlias(TenantId tenantId, String bundleAlias) {
+        log.trace("Executing findWidgetTypesByTenantIdAndBundleAlias, tenantId [{}], bundleAlias [{}]", tenantId, bundleAlias);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateString(bundleAlias, "Incorrect bundleAlias " + bundleAlias);
+        List<WidgetTypeEntity> widgetTypesEntities = widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(tenantId.getId(), bundleAlias);
+        return convertDataList(widgetTypesEntities);
+    }
+
+    @Override
+    public WidgetType findWidgetTypeByTenantIdBundleAliasAndAlias(TenantId tenantId, String bundleAlias, String alias) {
+        log.trace("Executing findWidgetTypeByTenantIdBundleAliasAndAlias, tenantId [{}], bundleAlias [{}], alias [{}]", tenantId, bundleAlias, alias);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateString(bundleAlias, "Incorrect bundleAlias " + bundleAlias);
+        Validator.validateString(alias, "Incorrect alias " + alias);
+        WidgetTypeEntity widgetTypeEntity = widgetTypeDao.findByTenantIdBundleAliasAndAlias(tenantId.getId(), bundleAlias, alias);
+        return getData(widgetTypeEntity);
+    }
+
+    @Override
+    public void deleteWidgetTypesByTenantIdAndBundleAlias(TenantId tenantId, String bundleAlias) {
+        log.trace("Executing deleteWidgetTypesByTenantIdAndBundleAlias, tenantId [{}], bundleAlias [{}]", tenantId, bundleAlias);
+        Validator.validateId(tenantId, "Incorrect tenantId " + tenantId);
+        Validator.validateString(bundleAlias, "Incorrect bundleAlias " + bundleAlias);
+        List<WidgetTypeEntity> widgetTypesEntities = widgetTypeDao.findWidgetTypesByTenantIdAndBundleAlias(tenantId.getId(), bundleAlias);
+        for (WidgetTypeEntity widgetTypeEntity : widgetTypesEntities) {
+            deleteWidgetType(new WidgetTypeId(widgetTypeEntity.getId()));
+        }
+    }
+
+    private DataValidator<WidgetType> widgetTypeValidator =
+            new DataValidator<WidgetType>() {
+                @Override
+                protected void validateDataImpl(WidgetType widgetType) {
+                    if (StringUtils.isEmpty(widgetType.getName())) {
+                        throw new DataValidationException("Widgets type name should be specified!");
+                    }
+                    if (StringUtils.isEmpty(widgetType.getBundleAlias())) {
+                        throw new DataValidationException("Widgets type bundle alias should be specified!");
+                    }
+                    if (widgetType.getDescriptor() == null || widgetType.getDescriptor().size() == 0) {
+                        throw new DataValidationException("Widgets type descriptor can't be empty!");
+                    }
+                    if (widgetType.getTenantId() == null) {
+                        widgetType.setTenantId(new TenantId(ModelConstants.NULL_UUID));
+                    }
+                    if (!widgetType.getTenantId().getId().equals(ModelConstants.NULL_UUID)) {
+                        TenantEntity tenant = tenantDao.findById(widgetType.getTenantId().getId());
+                        if (tenant == null) {
+                            throw new DataValidationException("Widget type is referencing to non-existent tenant!");
+                        }
+                    }
+                }
+
+                @Override
+                protected void validateCreate(WidgetType widgetType) {
+
+                    WidgetsBundleEntity widgetsBundle = widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(widgetType.getTenantId().getId(), widgetType.getBundleAlias());
+                    if (widgetsBundle == null) {
+                        throw new DataValidationException("Widget type is referencing to non-existent widgets bundle!");
+                    }
+
+                    String alias = widgetType.getName().toLowerCase().replaceAll("\\W+", "_");
+                    String originalAlias = alias;
+                    int c = 1;
+                    WidgetTypeEntity withSameAlias;
+                    do {
+                        withSameAlias = widgetTypeDao.findByTenantIdBundleAliasAndAlias(widgetType.getTenantId().getId(), widgetType.getBundleAlias(), alias);
+                        if (withSameAlias != null) {
+                            alias = originalAlias + (++c);
+                        }
+                    } while(withSameAlias != null);
+                    widgetType.setAlias(alias);
+                }
+
+                @Override
+                protected void validateUpdate(WidgetType widgetType) {
+                    WidgetTypeEntity storedWidgetType = widgetTypeDao.findById(widgetType.getId().getId());
+                    if (!storedWidgetType.getTenantId().equals(widgetType.getTenantId().getId())) {
+                        throw new DataValidationException("Can't move existing widget type to different tenant!");
+                    }
+                    if (!storedWidgetType.getBundleAlias().equals(widgetType.getBundleAlias())) {
+                        throw new DataValidationException("Update of widget type bundle alias is prohibited!");
+                    }
+                    if (!storedWidgetType.getAlias().equals(widgetType.getAlias())) {
+                        throw new DataValidationException("Update of widget type alias is prohibited!");
+                    }
+                }
+            };
+}

diff --git a/dao/src/main/resources/demo-data.cql b/dao/src/main/resources/demo-data.cql
new file mode 100644
index 0000000..68154cc
--- /dev/null
+++ b/dao/src/main/resources/demo-data.cql
@@ -0,0 +1,402 @@
+--
+-- Copyright © 2016 The Thingsboard Authors
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+/** Demo data **/
+
+/** Demo tenant **/
+
+INSERT INTO thingsboard.tenant ( id, region, title, search_text )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Global',
+	'Tenant',
+	'tenant'
+);
+
+/** Demo tenant admin **/
+
+INSERT INTO thingsboard.user ( id, tenant_id, customer_id, email, search_text, authority )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:02+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( 0 ),
+	'tenant@thingsboard.org',
+	'tenant@thingsboard.org',
+	'TENANT_ADMIN'
+);
+
+INSERT INTO thingsboard.user_credentials ( id, user_id, enabled, password )
+VALUES (
+	now ( ),
+	minTimeuuid ( '2016-11-01 01:02:02+0000' ),
+	true,
+	'$2a$10$CUHks/PiEvxSGCKzrHCQGe/MoseIQw6qijIDjSa2sNoIyXkgJGyMO'
+);
+
+/** Demo customers **/
+
+INSERT INTO thingsboard.customer ( id, tenant_id, title, search_text )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:03+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Customer A',
+	'customer a'
+);
+
+INSERT INTO thingsboard.customer ( id, tenant_id, title, search_text )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:03+0001' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Customer B',
+	'customer b'
+);
+
+INSERT INTO thingsboard.customer ( id, tenant_id, title, search_text )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:03+0002' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Customer C',
+	'customer c'
+);
+
+/** Demo customer user **/
+
+INSERT INTO thingsboard.user ( id, tenant_id, customer_id, email, search_text, authority )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:04+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0000' ),
+	'customer@thingsboard.org',
+	'customer@thingsboard.org',
+	'CUSTOMER_USER'
+);
+
+INSERT INTO thingsboard.user ( id, tenant_id, customer_id, email, search_text, authority )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:04+0001' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0000' ),
+	'customerA@thingsboard.org',
+	'customera@thingsboard.org',
+	'CUSTOMER_USER'
+);
+
+INSERT INTO thingsboard.user ( id, tenant_id, customer_id, email, search_text, authority )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:04+0002' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0001' ),
+	'customerB@thingsboard.org',
+	'customerb@thingsboard.org',
+	'CUSTOMER_USER'
+);
+
+INSERT INTO thingsboard.user ( id, tenant_id, customer_id, email, search_text, authority )
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:04+0003' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0002' ),
+	'customerC@thingsboard.org',
+	'customerc@thingsboard.org',
+	'CUSTOMER_USER'
+);
+
+
+INSERT INTO thingsboard.user_credentials ( id, user_id, enabled, password )
+VALUES (
+	now ( ),
+	minTimeuuid ( '2016-11-01 01:02:04+0000' ),
+	true,
+	'$2a$10$1Ki3Nl10pagxZncDQZtU.uHttir3HGKzLeovxCNKdSSJa3PU49L1C'
+);
+
+INSERT INTO thingsboard.user_credentials ( id, user_id, enabled, password )
+VALUES (
+	now ( ),
+	minTimeuuid ( '2016-11-01 01:02:04+0001' ),
+	true,
+	'$2a$10$1Ki3Nl10pagxZncDQZtU.uHttir3HGKzLeovxCNKdSSJa3PU49L1C'
+);
+
+INSERT INTO thingsboard.user_credentials ( id, user_id, enabled, password )
+VALUES (
+	now ( ),
+	minTimeuuid ( '2016-11-01 01:02:04+0002' ),
+	true,
+	'$2a$10$1Ki3Nl10pagxZncDQZtU.uHttir3HGKzLeovxCNKdSSJa3PU49L1C'
+);
+
+INSERT INTO thingsboard.user_credentials ( id, user_id, enabled, password )
+VALUES (
+	now ( ),
+	minTimeuuid ( '2016-11-01 01:02:04+0003' ),
+	true,
+	'$2a$10$1Ki3Nl10pagxZncDQZtU.uHttir3HGKzLeovxCNKdSSJa3PU49L1C'
+);
+
+/** Demo device **/
+
+INSERT INTO thingsboard.device ( id, tenant_id, customer_id, name, search_text)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:05+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0000' ),
+	'Test Device A1',
+	'test device a1'
+);
+
+INSERT INTO thingsboard.device ( id, tenant_id, customer_id, name, search_text)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:05+0001' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0000' ),
+	'Test Device A2',
+	'test device a2'
+);
+
+INSERT INTO thingsboard.device ( id, tenant_id, customer_id, name, search_text)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:05+0002' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0000' ),
+	'Test Device A3',
+	'test device a3'
+);
+
+INSERT INTO thingsboard.device ( id, tenant_id, customer_id, name, search_text)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:05+0003' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0001' ),
+	'Test Device B1',
+	'test device b1'
+);
+
+INSERT INTO thingsboard.device ( id, tenant_id, customer_id, name, search_text)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:05+0004' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:03+0002' ),
+	'Test Device C1',
+	'test device c1'
+);
+
+INSERT INTO thingsboard.device_credentials ( id, device_id, credentials_type, credentials_id)
+VALUES (
+	now(),
+	minTimeuuid ( '2016-11-01 01:02:05+0000' ),
+	'ACCESS_TOKEN',
+	'A1_TEST_TOKEN'
+);
+
+INSERT INTO thingsboard.device_credentials ( id, device_id, credentials_type, credentials_id)
+VALUES (
+	now(),
+	minTimeuuid ( '2016-11-01 01:02:05+0001' ),
+	'ACCESS_TOKEN',
+	'A2_TEST_TOKEN'
+);
+
+INSERT INTO thingsboard.device_credentials ( id, device_id, credentials_type, credentials_id)
+VALUES (
+	now(),
+	minTimeuuid ( '2016-11-01 01:02:05+0002' ),
+	'ACCESS_TOKEN',
+	'A3_TEST_TOKEN'
+);
+
+INSERT INTO thingsboard.device_credentials ( id, device_id, credentials_type, credentials_id)
+VALUES (
+	now(),
+	minTimeuuid ( '2016-11-01 01:02:05+0003' ),
+	'ACCESS_TOKEN',
+	'B1_TEST_TOKEN'
+);
+
+INSERT INTO thingsboard.device_credentials ( id, device_id, credentials_type, credentials_id)
+VALUES (
+	now(),
+	minTimeuuid ( '2016-11-01 01:02:05+0004' ),
+	'ACCESS_TOKEN',
+	'C1_TEST_TOKEN'
+);
+
+/** Demo data **/
+
+/** Demo plugins & rules **/
+
+/** Email plugin. Please change username and password here or via configuration **/
+
+INSERT INTO thingsboard.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:06+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+    'Demo Email Plugin',
+    'ACTIVE',
+	'mail sender plugin',
+	'mail',
+	'org.thingsboard.server.extensions.core.plugin.mail.MailPlugin',
+	true,
+	'{
+       "host": "smtp.gmail.com",
+       "port": 587,
+       "username": "username@gmail.com",
+       "password": "password",
+       "otherProperties": [
+         {
+           "key":"mail.smtp.auth",
+           "value":"true"
+         },
+         {
+           "key":"mail.smtp.timeout",
+           "value":"10000"
+         },
+         {
+           "key":"mail.smtp.starttls.enable",
+           "value":"true"
+         },
+         {
+           "key":"mail.smtp.host",
+           "value":"smtp.gmail.com"
+         },
+         {
+           "key":"mail.smtp.port",
+           "value":"587"
+         }
+       ]
+     }'
+);
+
+INSERT INTO thingsboard.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:07+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+    'Demo Time RPC Plugin',
+    'ACTIVE',
+	'demo time rpc plugin',
+	'time',
+	'org.thingsboard.server.extensions.core.plugin.time.TimePlugin',
+	false,
+	'{"timeFormat":"yyyy MM dd HH:mm:ss.SSS"}'
+);
+
+INSERT INTO thingsboard.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access, configuration)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:08+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+    'Demo Device Messaging RPC Plugin',
+    'ACTIVE',
+	'demo device messaging rpc plugin',
+	'messaging',
+	'org.thingsboard.server.extensions.core.plugin.messaging.DeviceMessagingPlugin',
+	false,
+	'{"maxDeviceCountPerCustomer":1024,"defaultTimeout":20000,"maxTimeout":60000}'
+);
+
+
+INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:09+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Demo Alarm Rule',
+	'mail',
+    'ACTIVE',
+	'demo alarm rule',
+	0,
+	'[{"clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter", "name":"MsgTypeFilter", "configuration": {"messageTypes":["POST_TELEMETRY","POST_ATTRIBUTES","GET_ATTRIBUTES"]}}
+	,
+	{"clazz":"org.thingsboard.server.extensions.core.filter.DeviceTelemetryFilter", "name":"Temperature filter", "configuration": {"filter":"typeof temperature !== ''undefined'' && temperature >= 100"}}
+	]',
+	'{"clazz":"org.thingsboard.server.extensions.core.processor.AlarmDeduplicationProcessor", "name": "AlarmDeduplicationProcessor", "configuration":{
+                                                                                                                                "alarmIdTemplate": "[$date.get(''yyyy-MM-dd HH:mm'')] Device $cs.get(''serialNumber'')($cs.get(''model'')) temperature is high!",
+                                                                                                                                "alarmBodyTemplate": "[$date.get(''yyyy-MM-dd HH:mm:ss'')] Device $cs.get(''serialNumber'')($cs.get(''model'')) temperature is $temp.valueAsString!"
+                                                                                                                              }}',
+	'{"clazz":"org.thingsboard.server.extensions.core.action.mail.SendMailAction", "name":"Send Mail Action", "configuration":{
+                                                                                                                                "sendFlag": "isNewAlarm",
+                                                                                                                                "fromTemplate": "thingsboard@gmail.com",
+                                                                                                                                "toTemplate": "thingsboard@gmail.com",
+                                                                                                                                "subjectTemplate": "$alarmId",
+                                                                                                                                "bodyTemplate": "$alarmBody"
+                                                                                                                              }}'
+);
+
+INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:10+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Demo Alarm Rule',
+	'mail',
+    'ACTIVE',
+	'demo alarm rule',
+	0,
+	'[{"clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter", "name":"MsgTypeFilter", "configuration": {"messageTypes":["POST_TELEMETRY","POST_ATTRIBUTES","GET_ATTRIBUTES"]}}
+	,
+	{"clazz":"org.thingsboard.server.extensions.core.filter.DeviceTelemetryFilter", "name":"Temperature filter", "configuration": {"filter":"typeof temperature !== ''undefined'' && temperature >= 100"}}
+	]',
+	'{"clazz":"org.thingsboard.server.extensions.core.processor.AlarmDeduplicationProcessor", "name": "AlarmDeduplicationProcessor", "configuration":{
+                                                                                                                                "alarmIdTemplate": "[$date.get(''yyyy-MM-dd HH:mm'')] Device $cs.get(''serialNumber'')($cs.get(''model'')) temperature is high!",
+                                                                                                                                "alarmBodyTemplate": "[$date.get(''yyyy-MM-dd HH:mm:ss'')] Device $cs.get(''serialNumber'')($cs.get(''model'')) temperature is $temperature.valueAsString!"
+                                                                                                                              }}',
+	'{"clazz":"org.thingsboard.server.extensions.core.action.mail.SendMailAction", "name":"Send Mail Action", "configuration":{
+                                                                                                                                "sendFlag": "isNewAlarm",
+                                                                                                                                "fromTemplate": "thingsboard@gmail.com",
+                                                                                                                                "toTemplate": "thingsboard@gmail.com",
+                                                                                                                                "subjectTemplate": "$alarmId",
+                                                                                                                                "bodyTemplate": "$alarmBody"
+                                                                                                                              }}'
+);
+
+INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:10+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Demo getTime RPC Rule',
+	'time',
+    'ACTIVE',
+	'demo alarm rule',
+	0,
+	'[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getTime"}]},"name":"getTime method filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]',
+	null,
+	'{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"getTimeAction"}'
+);
+
+INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:11+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Demo Time RPC Rule',
+	'time',
+    'ACTIVE',
+	'demo time rpc rule',
+	0,
+	'[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getTime"}]},"name":"getTime method filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]',
+	null,
+	'{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"getTimeAction"}'
+);
+
+INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action)
+VALUES (
+	minTimeuuid ( '2016-11-01 01:02:12+0000' ),
+	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
+	'Demo Messaging RPC Rule',
+	'messaging',
+    'ACTIVE',
+	'demo messaging rpc rule',
+	0,
+	'[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getDevices"},{"name":"sendMsg"}]},"name":"Messaging methods filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]',
+	null,
+	'{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"Messaging RPC Action"}'
+);
\ No newline at end of file

diff --git a/dao/src/main/resources/schema.cql b/dao/src/main/resources/schema.cql
new file mode 100644
index 0000000..57bc650
--- /dev/null
+++ b/dao/src/main/resources/schema.cql
@@ -0,0 +1,425 @@
+--
+-- Copyright © 2016 The Thingsboard Authors
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+CREATE KEYSPACE IF NOT EXISTS thingsboard
+WITH replication = {
+	'class' : 'SimpleStrategy',
+	'replication_factor' : 1
+};
+
+CREATE TABLE IF NOT EXISTS thingsboard.user (
+	id timeuuid,
+	tenant_id timeuuid,
+	customer_id timeuuid,
+	email text,
+	search_text text,
+	authority text,
+	first_name text,
+	last_name text,
+	additional_info text,
+	PRIMARY KEY (id, tenant_id, customer_id, authority)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.user_by_email AS
+	SELECT *
+	from thingsboard.user
+	WHERE email IS NOT NULL AND tenant_id IS NOT NULL AND customer_id IS NOT NULL AND id IS NOT NULL AND authority IS NOT
+	NULL
+	PRIMARY KEY ( email, tenant_id, customer_id, id, authority );
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.user_by_tenant_and_search_text AS
+	SELECT *
+	from thingsboard.user
+	WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND authority IS NOT NULL AND search_text IS NOT NULL AND id
+	IS NOT NULL
+	PRIMARY KEY ( tenant_id, customer_id, authority, search_text, id )
+	WITH CLUSTERING ORDER BY ( customer_id DESC, authority DESC, search_text ASC, id DESC );
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.user_by_customer_and_search_text AS
+	SELECT *
+	from thingsboard.user
+	WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND authority IS NOT NULL AND search_text IS NOT NULL AND id
+	IS NOT NULL
+	PRIMARY KEY ( customer_id, tenant_id, authority, search_text, id )
+	WITH CLUSTERING ORDER BY ( tenant_id DESC, authority DESC, search_text ASC, id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.user_credentials (
+	id timeuuid PRIMARY KEY,
+	user_id timeuuid,
+	enabled boolean,
+	password text,
+	activate_token text,
+	reset_token text
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.user_credentials_by_user AS
+	SELECT *
+	from thingsboard.user_credentials
+	WHERE user_id IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( user_id, id );
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.user_credentials_by_activate_token AS
+	SELECT *
+	from thingsboard.user_credentials
+	WHERE activate_token IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( activate_token, id );
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.user_credentials_by_reset_token AS
+	SELECT *
+	from thingsboard.user_credentials
+	WHERE reset_token IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( reset_token, id );
+
+CREATE TABLE IF NOT EXISTS thingsboard.admin_settings (
+	id timeuuid PRIMARY KEY,
+	key text,
+	json_value text
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.admin_settings_by_key AS
+	SELECT *
+	from thingsboard.admin_settings
+	WHERE key IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( key, id )
+	WITH CLUSTERING ORDER BY ( id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.tenant (
+	id timeuuid,
+	title text,
+	search_text text,
+	region text,
+	country text,
+	state text,
+	city text,
+	address text,
+	address2 text,
+	zip text,
+	phone text,
+	email text,
+	additional_info text,
+	PRIMARY KEY (id, region)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.tenant_by_region_and_search_text AS
+	SELECT *
+	from thingsboard.tenant
+	WHERE region IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( region, search_text, id )
+	WITH CLUSTERING ORDER BY ( search_text ASC, id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.customer (
+	id timeuuid,
+	tenant_id timeuuid,
+	title text,
+	search_text text,
+	country text,
+	state text,
+	city text,
+	address text,
+	address2 text,
+	zip text,
+	phone text,
+	email text,
+	additional_info text,
+	PRIMARY KEY (id, tenant_id)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.customer_by_tenant_and_search_text AS
+	SELECT *
+	from thingsboard.customer
+	WHERE tenant_id IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( tenant_id, search_text, id )
+	WITH CLUSTERING ORDER BY ( search_text ASC, id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.device (
+	id timeuuid,
+	tenant_id timeuuid,
+	customer_id timeuuid,
+	name text,
+	search_text text,
+	additional_info text,
+	PRIMARY KEY (id, tenant_id, customer_id)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.device_by_tenant_and_name AS
+	SELECT *
+	from thingsboard.device
+	WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND name IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( tenant_id, name, id, customer_id)
+	WITH CLUSTERING ORDER BY ( name ASC, id DESC, customer_id DESC);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.device_by_tenant_and_search_text AS
+	SELECT *
+	from thingsboard.device
+	WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( tenant_id, search_text, id, customer_id)
+	WITH CLUSTERING ORDER BY ( search_text ASC, id DESC, customer_id DESC);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.device_by_customer_and_search_text AS
+	SELECT *
+	from thingsboard.device
+	WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( customer_id, tenant_id, search_text, id )
+	WITH CLUSTERING ORDER BY ( tenant_id DESC, search_text ASC, id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.device_credentials (
+	id timeuuid PRIMARY KEY,
+	device_id timeuuid,
+	credentials_type text,
+	credentials_id text,
+	credentials_value text
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.device_credentials_by_device AS
+	SELECT *
+	from thingsboard.device_credentials
+	WHERE device_id IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( device_id, id );
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.device_credentials_by_credentials_id AS
+	SELECT *
+	from thingsboard.device_credentials
+	WHERE credentials_id IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( credentials_id, id );
+
+CREATE TABLE IF NOT EXISTS thingsboard.widgets_bundle (
+    id timeuuid,
+    tenant_id timeuuid,
+    alias text,
+    title text,
+    search_text text,
+    image blob,
+    PRIMARY KEY (id, tenant_id)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.widgets_bundle_by_tenant_and_search_text AS
+    SELECT *
+    from thingsboard.widgets_bundle
+    WHERE tenant_id IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
+    PRIMARY KEY ( tenant_id, search_text, id )
+    WITH CLUSTERING ORDER BY ( search_text ASC, id DESC );
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.widgets_bundle_by_tenant_and_alias AS
+    SELECT *
+    from thingsboard.widgets_bundle
+    WHERE tenant_id IS NOT NULL AND alias IS NOT NULL AND id IS NOT NULL
+    PRIMARY KEY ( tenant_id, alias, id )
+    WITH CLUSTERING ORDER BY ( alias ASC, id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.widget_type (
+    id timeuuid,
+    tenant_id timeuuid,
+    bundle_alias text,
+    alias text,
+    name text,
+    descriptor text,
+    PRIMARY KEY (id, tenant_id, bundle_alias)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.widget_type_by_tenant_and_aliases AS
+    SELECT *
+    from thingsboard.widget_type
+    WHERE tenant_id IS NOT NULL AND bundle_alias IS NOT NULL AND alias IS NOT NULL AND id IS NOT NULL
+    PRIMARY KEY ( tenant_id, bundle_alias, alias, id )
+    WITH CLUSTERING ORDER BY ( bundle_alias ASC, alias ASC, id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.dashboard (
+	id timeuuid,
+	tenant_id timeuuid,
+	customer_id timeuuid,
+	title text,
+	search_text text,
+	configuration text,
+	PRIMARY KEY (id, tenant_id, customer_id)
+);	
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.dashboard_by_tenant_and_search_text AS
+	SELECT *
+	from thingsboard.dashboard
+	WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( tenant_id, customer_id, search_text, id )
+	WITH CLUSTERING ORDER BY ( customer_id DESC, search_text ASC, id DESC );
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.dashboard_by_customer_and_search_text AS
+	SELECT *
+	from thingsboard.dashboard
+	WHERE tenant_id IS NOT NULL AND customer_id IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
+	PRIMARY KEY ( customer_id, tenant_id, search_text, id )
+	WITH CLUSTERING ORDER BY ( tenant_id DESC, search_text ASC, id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.ts_kv_cf (
+    entity_type text, // (DEVICE, CUSTOMER, TENANT)
+    entity_id timeuuid,
+    key text,
+    partition bigint,
+    ts bigint,
+    bool_v boolean,
+    str_v text,
+    long_v bigint,
+    dbl_v double,
+    PRIMARY KEY (( entity_type, entity_id, key, partition ), ts)
+);
+
+CREATE TABLE IF NOT EXISTS thingsboard.ts_kv_partitions_cf (
+    entity_type text, // (DEVICE, CUSTOMER, TENANT)
+    entity_id timeuuid,
+    key text,
+    partition bigint,
+    PRIMARY KEY (( entity_type, entity_id, key ), partition)
+) WITH CLUSTERING ORDER BY ( partition ASC )
+  AND compaction = { 'class' :  'LeveledCompactionStrategy'  };
+
+CREATE TABLE IF NOT EXISTS thingsboard.ts_kv_latest_cf (
+    entity_type text, // (DEVICE, CUSTOMER, TENANT)
+    entity_id timeuuid,
+    key text,
+    ts bigint,
+    bool_v boolean,
+    str_v text,
+    long_v bigint,
+    dbl_v double,
+    PRIMARY KEY (( entity_type, entity_id ), key)
+) WITH compaction = { 'class' :  'LeveledCompactionStrategy'  };
+
+
+CREATE TABLE IF NOT EXISTS thingsboard.attributes_kv_cf (
+    entity_type text, // (DEVICE, CUSTOMER, TENANT)
+    entity_id timeuuid,
+    attribute_type text, // (CLIENT_SIDE, SHARED, SERVER_SIDE)
+    attribute_key text,
+    bool_v boolean,
+    str_v text,
+    long_v bigint,
+    dbl_v double,
+    last_update_ts bigint,
+    PRIMARY KEY ((entity_type, entity_id, attribute_type), attribute_key)
+) WITH compaction = { 'class' :  'LeveledCompactionStrategy'  };
+
+CREATE TABLE IF NOT EXISTS  thingsboard.component_descriptor (
+    id timeuuid,
+    type text, //("FILTER", "PROCESSOR", "ACTION", "PLUGIN")
+    scope text,
+    name text,
+    search_text text,
+    clazz text,
+    configuration_descriptor text,
+    actions text,
+    PRIMARY KEY (clazz, id, type, scope)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.component_desc_by_type_search_text AS
+    SELECT *
+    from thingsboard.component_descriptor
+    WHERE type IS NOT NULL AND scope IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL AND clazz IS NOT NULL
+    PRIMARY KEY ( type, search_text, id, clazz, scope)
+    WITH CLUSTERING ORDER BY ( search_text DESC);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.component_desc_by_scope_type_search_text AS
+    SELECT *
+    from thingsboard.component_descriptor
+    WHERE type IS NOT NULL AND scope IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL AND clazz IS NOT NULL
+    PRIMARY KEY ( (scope, type), search_text, id, clazz)
+    WITH CLUSTERING ORDER BY ( search_text DESC);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.component_desc_by_id AS
+    SELECT *
+    from thingsboard.component_descriptor
+    WHERE type IS NOT NULL AND scope IS NOT NULL AND id IS NOT NULL AND clazz IS NOT NULL
+    PRIMARY KEY ( id, clazz, scope, type )
+    WITH CLUSTERING ORDER BY ( clazz ASC, scope ASC, type DESC);
+
+CREATE TABLE IF NOT EXISTS  thingsboard.rule (
+    id timeuuid,
+    tenant_id timeuuid,
+    name text,
+    state text,
+    search_text text,
+    weight int,
+    plugin_token text,
+    filters text, // Format: {"clazz":"A", "name": "Filter A", "configuration": {"types":["TELEMETRY"]}}
+    processor text, // Format: {"clazz":"A", "name": "Processor A", "configuration": null}
+    action text, // Format: {"clazz":"A", "name": "Action A", "configuration": null}
+    additional_info text,
+    PRIMARY KEY (id, tenant_id)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.rule_by_plugin_token AS
+    SELECT *
+
+    FROM thingsboard.rule
+    WHERE tenant_id IS NOT NULL AND id IS NOT NULL AND plugin_token IS NOT NULL
+    PRIMARY KEY (plugin_token, tenant_id, id) WITH CLUSTERING ORDER BY (tenant_id DESC, id DESC);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.rule_by_tenant_and_search_text AS
+    SELECT *
+    FROM thingsboard.rule
+    WHERE tenant_id IS NOT NULL AND id IS NOT NULL AND search_text IS NOT NULL
+    PRIMARY KEY (tenant_id, search_text, id) WITH CLUSTERING ORDER BY (search_text ASC);
+
+CREATE TABLE IF NOT EXISTS  thingsboard.plugin (
+    id uuid,
+    tenant_id uuid,
+    name text,
+    state text,
+    search_text text,
+    api_token text,
+    plugin_class text,
+    public_access boolean,
+    configuration text,
+    additional_info text,
+    PRIMARY KEY (id, tenant_id)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.plugin_by_api_token AS
+    SELECT *
+    FROM thingsboard.plugin
+    WHERE api_token IS NOT NULL AND id IS NOT NULL AND tenant_id IS NOT NULL
+    PRIMARY KEY (api_token, id, tenant_id) WITH CLUSTERING ORDER BY (id DESC);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.plugin_by_tenant_and_search_text AS
+    SELECT *
+    from thingsboard.plugin
+    WHERE tenant_id IS NOT NULL AND search_text IS NOT NULL AND id IS NOT NULL
+    PRIMARY KEY ( tenant_id, search_text, id )
+    WITH CLUSTERING ORDER BY ( search_text ASC, id DESC );
+
+CREATE TABLE IF NOT EXISTS thingsboard.event (
+	tenant_id timeuuid, // tenant or system
+	id timeuuid,
+	event_type text,
+	event_uid text,
+	entity_type text, // (device, customer, rule, plugin)
+	entity_id timeuuid,
+	body text,
+	PRIMARY KEY ((tenant_id, entity_type, entity_id), event_type, event_uid)
+);
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.event_by_type_and_id AS
+    SELECT *
+    FROM thingsboard.event
+    WHERE tenant_id IS NOT NULL AND entity_type IS NOT NULL AND entity_id IS NOT NULL AND id IS NOT NULL
+    AND event_type IS NOT NULL AND event_uid IS NOT NULL
+    PRIMARY KEY ((tenant_id, entity_type, entity_id), event_type, id, event_uid)
+    WITH CLUSTERING ORDER BY (event_type ASC, id ASC, event_uid ASC);
+
+
+CREATE MATERIALIZED VIEW IF NOT EXISTS thingsboard.event_by_id AS
+    SELECT *
+    FROM thingsboard.event
+    WHERE tenant_id IS NOT NULL AND entity_type IS NOT NULL AND entity_id IS NOT NULL AND id IS NOT NULL
+    AND event_type IS NOT NULL AND event_uid IS NOT NULL
+    PRIMARY KEY ((tenant_id, entity_type, entity_id), id, event_type, event_uid)
+    WITH CLUSTERING ORDER BY (id ASC, event_type ASC, event_uid ASC);

diff --git a/dao/src/main/resources/system-data.cql b/dao/src/main/resources/system-data.cql
new file mode 100644
index 0000000..1358e58
--- /dev/null
+++ b/dao/src/main/resources/system-data.cql
@@ -0,0 +1,258 @@
+--
+-- Copyright © 2016 The Thingsboard Authors
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+
+/** SYSTEM **/
+
+/** System admin **/
+INSERT INTO thingsboard.user ( id, tenant_id, customer_id, email, search_text, authority )
+VALUES ( minTimeuuid ( '2016-11-01 01:01:01+0000' ), minTimeuuid ( 0 ), minTimeuuid ( 0 ), 'sysadmin@thingsboard.org',
+'sysadmin@thingsboard.org', 'SYS_ADMIN' );
+
+INSERT INTO thingsboard.user_credentials ( id, user_id, enabled, password )
+VALUES ( now ( ), minTimeuuid ( '2016-11-01 01:01:01+0000' ), true,
+'$2a$10$5JTB8/hxWc9WAy62nCGSxeefl3KWmipA9nFpVdDa0/xfIseeBB4Bu' );
+
+/** System settings **/
+INSERT INTO thingsboard.admin_settings ( id, key, json_value )
+VALUES ( now ( ), 'general', '{
+	"baseUrl": "http://localhost:8080"
+}' );
+
+INSERT INTO thingsboard.admin_settings ( id, key, json_value )
+VALUES ( now ( ), 'mail', '{
+	"mailFrom": "Thingsboard <sysadmin@localhost.localdomain>",
+	"smtpProtocol": "smtp",
+	"smtpHost": "localhost",
+	"smtpPort": "25",
+	"timeout": "10000",
+	"enableTls": "false",
+	"username": "",
+	"password": ""
+}' );
+
+/** System widgets library **/
+INSERT INTO "thingsboard"."widgets_bundle" ( "id", "tenant_id", "alias", "search_text", "title" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'gpio_widgets', 'gpio widgets', 'GPIO widgets' );
+
+INSERT INTO "thingsboard"."widgets_bundle" ( "id", "tenant_id", "alias", "search_text", "title" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'maps', 'maps', 'Maps' );
+
+INSERT INTO "thingsboard"."widgets_bundle" ( "id", "tenant_id", "alias", "search_text", "title" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'digital gauges', 'Digital gauges' );
+
+INSERT INTO "thingsboard"."widgets_bundle" ( "id", "tenant_id", "alias", "search_text", "title" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'charts', 'Charts' );
+
+INSERT INTO "thingsboard"."widgets_bundle" ( "id", "tenant_id", "alias", "search_text", "title" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'cards', 'cards', 'Cards' );
+
+INSERT INTO "thingsboard"."widgets_bundle" ( "id", "tenant_id", "alias", "search_text", "title" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'analogue_gauges', 'analogue gauges', 'Analogue gauges' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'cards', 'attributes_card',
+'{"type":"latest","sizeX":7.5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#container {\n    overflow: auto;\n}\n\n.tbDatasource-container {\n    margin: 5px;\n    padding: 8px;\n}\n\n.tbDatasource-title {\n    font-size: 1.200rem;\n    font-weight: 500;\n    padding-bottom: 10px;\n}\n\n.tbDatasource-table {\n    width: 100%;\n    box-shadow: 0 0 10px #ccc;\n    border-collapse: collapse;\n    white-space: nowrap;\n    font-size: 1.000rem;\n    color: #757575;\n}\n\n.tbDatasource-table td {\n    position: relative;\n    border-top: 1px solid rgba(0, 0, 0, 0.12);\n    border-bottom: 1px solid rgba(0, 0, 0, 0.12);\n    padding: 0px 18px;\n    box-sizing: border-box;\n}","controllerScript":"var datasourceTitleCells = [];\nvar valueCells = [];\nvar labelCells = [];\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n    var container = $(containerElement);\n\n    for (var i in datasources) {\n        var tbDatasource = datasources[i];\n\n        var datasourceId = ''tbDatasource'' + i;\n        container.append(\n            \"<div id=''\" + datasourceId +\n            \"'' class=''tbDatasource-container''></div>\"\n        );\n\n        var datasourceContainer = $(''#'' + datasourceId,\n            container);\n\n        datasourceContainer.append(\n            \"<div class=''tbDatasource-title''>\" +\n            tbDatasource.name + \"</div>\"\n        );\n        \n        var datasourceTitleCell = $(''.tbDatasource-title'', datasourceContainer);\n        datasourceTitleCells.push(datasourceTitleCell);\n        \n        var tableId = ''table'' + i;\n        datasourceContainer.append(\n            \"<table id=''\" + tableId +\n            \"'' class=''tbDatasource-table''><col width=''30%''><col width=''70%''></table>\"\n        );\n        var table = $(''#'' + tableId, containerElement);\n\n        for (var a in tbDatasource.dataKeys) {\n            var dataKey = tbDatasource.dataKeys[a];\n            var labelCellId = ''labelCell'' + a;\n            var cellId = ''cell'' + a;\n            table.append(\"<tr><td id=''\" + labelCellId + \"''>\" + dataKey.label +\n                \"</td><td id=''\" + cellId +\n                \"''></td></tr>\");\n            var labelCell = $(''#'' + labelCellId, table);\n            labelCells.push(labelCell);\n            var valueCell = $(''#'' + cellId, table);\n            valueCells.push(valueCell);\n        }\n    }\n\n}\n\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged) {\n    \n    if (sizeChanged) {\n        var datasoirceTitleFontSize = height/8;\n        if (width/height <= 1.5) {\n            datasoirceTitleFontSize = width/12;\n        }\n        datasoirceTitleFontSize = Math.min(datasoirceTitleFontSize, 20);\n        for (var i in datasourceTitleCells) {\n            datasourceTitleCells[i].css(''font-size'', datasoirceTitleFontSize+''px'');\n        }\n        var valueFontSize = height/9;\n        var labelFontSize = height/9;\n        if (width/height <= 1.5) {\n            valueFontSize = width/15;\n            labelFontSize = width/15;\n        }\n        valueFontSize = Math.min(valueFontSize, 18);\n        labelFontSize = Math.min(labelFontSize, 18);\n\n        for (i in valueCells) {\n            valueCells[i].css(''font-size'', valueFontSize+''px'');\n            valueCells[i].css(''height'', valueFontSize*2.5+''px'');\n            valueCells[i].css(''padding'', ''0px '' + valueFontSize + ''px'');\n            labelCells[i].css(''font-size'', labelFontSize+''px'');\n            labelCells[i].css(''height'', labelFontSize*2.5+''px'');\n            labelCells[i].css(''padding'', ''0px '' + labelFontSize + ''px'');\n        }\n    }\n    \n    for (i in valueCells) {\n        var cellData = data[i];\n        if (cellData.data.length > 0) {\n            var tvPair = cellData.data[cellData.data.length -\n                1];\n            var value = tvPair[1];\n            valueCells[i].html(value);\n        }\n    }\n\n};","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Random\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Attributes card\"}"}',
+'Attributes card' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'cards', 'simple_card',
+'{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#container {\n    overflow: auto;\n}\n\n.tbDatasource-container {\n    width: 100%;\n    height: 100%;\n    overflow: hidden;\n}\n\n.tbDatasource-table {\n    width: 100%;\n    height: 100%;\n    border-collapse: collapse;\n    white-space: nowrap;\n    font-weight: 100;\n    text-align: right;\n}\n\n.tbDatasource-table td {\n    padding: 12px;\n    position: relative;\n    box-sizing: border-box;\n}\n\n.tbDatasource-data-key {\n    opacity: 0.7;\n    font-weight: 400;\n    font-size: 3.500rem;\n}\n\n.tbDatasource-value {\n    font-size: 5.000rem;\n}","controllerScript":"var labelCell;\nvar valueCell;\nvar valueFontSize;\nvar padding;\nvar datasourceContainer;\nvar units;\nvar valueDec;\nvar labelPosition;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n    var container = $(containerElement);\n    \n    units = settings.units || \"\";\n    valueDec = (typeof settings.valueDec !== ''undefined'' && settings.valueDec !== null)\n                ? settings.valueDec : 2;\n                \n    labelPosition = settings.labelPosition || ''left'';\n    \n    if (datasources.length > 0) {\n        var tbDatasource = datasources[0];\n        var datasourceId = ''tbDatasource'' + 0;\n        container.append(\n            \"<div id=''\" + datasourceId +\n            \"'' class=''tbDatasource-container''></div>\"\n        );\n        \n        datasourceContainer = $(''#'' + datasourceId,\n            container);\n        \n        var tableId = ''table'' + 0;\n        datasourceContainer.append(\n            \"<table id=''\" + tableId +\n            \"'' class=''tbDatasource-table''><col width=''30%''><col width=''70%''></table>\"\n        );\n        var table = $(''#'' + tableId, containerElement);\n        if (labelPosition === ''top'') {\n            table.css(''text-align'', ''left'');\n        }\n        \n        if (tbDatasource.dataKeys.length > 0) {\n            var dataKey = tbDatasource.dataKeys[0];\n            var labelCellId = ''labelCell'' + 0;\n            var cellId = ''cell'' + 0;\n            if (labelPosition === ''left'') {\n                table.append(\n                    \"<tr><td class=''tbDatasource-data-key'' id=''\" + labelCellId +\"''>\" +\n                    dataKey.label +\n                    \"</td><td class=''tbDatasource-value'' id=''\" +\n                    cellId +\n                    \"''></td></tr>\");\n            } else {\n                table.append(\n                    \"<tr style=''vertical-align: bottom;''><td class=''tbDatasource-data-key'' id=''\" + labelCellId +\"''>\" +\n                    dataKey.label +\n                    \"</td></tr><tr><td class=''tbDatasource-value'' id=''\" +\n                    cellId +\n                    \"''></td></tr>\");\n            }\n            labelCell = $(''#'' + labelCellId, table);\n            valueCell = $(''#'' + cellId, table);\n            valueCell.html(0 + '' '' + units);\n        }\n    }\n    \n    $.fn.textWidth = function(){\n        var html_org = $(this).html();\n        var html_calc = ''<span>'' + html_org + ''</span>'';\n        $(this).html(html_calc);\n        var width = $(this).find(''span:first'').width();\n        $(this).html(html_org);\n        return width;\n    };\n}\n\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged) {\n    \n    function isNumber(n) {\n        return !isNaN(parseFloat(n)) && isFinite(n);\n    }\n    \n    function padValue(val, dec, int) {\n        var i = 0;\n        var s, strVal, n;\n    \n        val = parseFloat(val);\n        n = (val < 0);\n        val = Math.abs(val);\n    \n        if (dec > 0) {\n            strVal = val.toFixed(dec).toString().split(''.'');\n            s = int - strVal[0].length;\n    \n            for (; i < s; ++i) {\n                strVal[0] = ''0'' + strVal[0];\n            }\n    \n            strVal = (n ? ''-'' : '''') + strVal[0] + ''.'' + strVal[1];\n        }\n    \n        else {\n            strVal = Math.round(val).toString();\n            s = int - strVal.length;\n    \n            for (; i < s; ++i) {\n                strVal = ''0'' + strVal;\n            }\n    \n            strVal = (n ? ''-'' : '''') + strVal;\n        }\n    \n        return strVal;\n    }\n    \n    if (sizeChanged) {\n        var labelFontSize;\n        if (labelPosition === ''top'') {\n            padding = height/20;\n            labelFontSize = height/4;\n            valueFontSize = height/2;\n        } else {\n            padding = width/50;\n            labelFontSize = height/2.5;\n            valueFontSize = height/2;\n            if (width/height <= 2.7) {\n                labelFontSize = width/7;\n                valueFontSize = width/6;\n            }\n        }\n        padding = Math.min(12, padding);\n        \n        if (labelCell) {\n            labelCell.css(''font-size'', labelFontSize+''px'');\n            labelCell.css(''padding'', padding+''px'');\n        }\n        if (valueCell) {\n            valueCell.css(''font-size'', valueFontSize+''px'');\n            valueCell.css(''padding'', padding+''px'');\n        }\n    }\n\n    if (valueCell && data.length > 0) {\n        var cellData = data[0];\n        if (cellData.data.length > 0) {\n            var tvPair = cellData.data[cellData.data.length -\n                1];\n            var value = tvPair[1];\n            var txtValue;\n            if (isNumber(value)) {\n                txtValue = padValue(value, valueDec, 0) + '' '' + units;\n            } else {\n                txtValue = value;\n            }\n            valueCell.html(txtValue);\n            var targetWidth;\n            var minDelta;\n            if (labelPosition === ''left'') {\n                targetWidth = datasourceContainer.width() - labelCell.width();\n                minDelta = width/16 + padding;\n            } else {\n                targetWidth = datasourceContainer.width();\n                minDelta = padding;\n            }\n            var delta = targetWidth - valueCell.textWidth();\n            var fontSize = valueFontSize;\n            if (targetWidth > minDelta) {\n                while (delta < minDelta && fontSize > 6) {\n                    fontSize--;\n                    valueCell.css(''font-size'', fontSize+''px'');\n                    delta = targetWidth - valueCell.textWidth();\n                }\n            }\n        }\n    }\n\n};\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"units\": {\n                \"title\": \"Units\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"valueDec\": {\n                \"title\": \"Digits count for decimal part of value\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"labelPosition\": {\n                \"title\": \"Label position\",\n                \"type\": \"string\",\n                \"default\": \"left\"\n            }\n        },\n        \"required\": []\n    },\n    \"form\": [\n        \"units\",\n        \"valueDec\",\n        {\n           \"key\": \"labelPosition\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"left\",\n                   \"label\": \"Left\"\n               },\n               {\n                   \"value\": \"top\",\n                   \"label\": \"Top\"\n               }\n            ]\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.2392660816082064,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ff5722\",\"color\":\"rgba(255, 255, 255, 0.87)\",\"padding\":\"16px\",\"settings\":{\"units\":\"°C\",\"valueDec\":1,\"labelPosition\":\"top\"},\"title\":\"Simple card\"}"}',
+'Simple card' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'analogue_gauges', 'speed_gauge_canvas_gauges',
+'{"type":"latest","sizeX":7,"sizeY":5,"resources":[],"templateHtml":"<canvas id=\"radialGauge\"></canvas>\n","templateCss":"","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbAnalogueRadialGauge(containerElement, settings, data, ''radialGauge'');    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged) {\n    gauge.redraw(width, height, data, sizeChanged);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },\n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"units\": {\n                \"title\": \"Units\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"majorTicksCount\": {\n                \"title\": \"Major ticks count\",\n                \"type\": \"number\",\n                \"default\": null\n            },\n            \"minorTicks\": {\n                \"title\": \"Minor ticks count\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"valueBox\": {\n                \"title\": \"Show value box\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"valueInt\": {\n                \"title\": \"Digits count for integer part of value\",\n                \"type\": \"number\",\n                \"default\": 3\n            },\n            \"valueDec\": {\n                \"title\": \"Digits count for decimal part of value\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorPlate\": {\n                \"title\": \"Plate color\",\n                \"type\": \"string\",\n                \"default\": \"#fff\"\n            },\n            \"colorMajorTicks\": {\n                \"title\": \"Major ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#444\"\n            },\n            \"colorMinorTicks\": {\n                \"title\": \"Minor ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorNeedle\": {\n                \"title\": \"Needle color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleEnd\": {\n                \"title\": \"Needle color - end gradient\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleShadowUp\": {\n                \"title\": \"Upper half of the needle shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(2,255,255,0.2)\"\n            },\n            \"colorNeedleShadowDown\": {\n                \"title\": \"Drop shadow needle color.\",\n                \"type\": \"string\",\n                \"default\": \"rgba(188,143,143,0.45)\"\n            },\n            \"colorValueBoxRect\": {\n                \"title\": \"Value box rectangle stroke color\",\n                \"type\": \"string\",\n                \"default\": \"#888\"\n            },\n            \"colorValueBoxRectEnd\": {\n                \"title\": \"Value box rectangle stroke color - end gradient\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorValueBoxBackground\": {\n                \"title\": \"Value box background color\",\n                \"type\": \"string\",\n                \"default\": \"#babab2\"\n            },\n            \"colorValueBoxShadow\": {\n                \"title\": \"Value box shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(0,0,0,1)\"\n            },\n            \"highlights\": {\n                \"title\": \"Highlights\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Highlight\",\n                  \"type\": \"object\",\n                  \"properties\": {\n                    \"from\": {\n                      \"title\": \"From\",\n                      \"type\": \"number\"\n                    },\n                    \"to\": {\n                      \"title\": \"To\",\n                      \"type\": \"number\"\n                    },\n                    \"color\": {\n                      \"title\": \"Color\",\n                      \"type\": \"string\"\n                    }\n                  }\n                }\n            },\n            \"highlightsWidth\": {\n                \"title\": \"Highlights width\",\n                \"type\": \"number\",\n                \"default\": 15\n            },\n            \"showBorder\": {\n                \"title\": \"Show border\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"numbersFont\": {\n                \"title\": \"Tick numbers font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"titleFont\": {\n                \"title\": \"Title text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 24\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"unitsFont\": {\n                \"title\": \"Units text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 22\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Value text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 40\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#444\"\n                    },\n                    \"shadowColor\": {\n                        \"title\": \"Shadow color\",\n                        \"type\": \"string\",\n                        \"default\": \"rgba(0,0,0,0.3)\"\n                    }\n                }\n            },\n            \"animation\": {\n                \"title\": \"Enable animation\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"animationDuration\": {\n                \"title\": \"Animation duration\",\n                \"type\": \"number\",\n                \"default\": 500\n            },\n            \"animationRule\": {\n                \"title\": \"Animation rule\",\n                \"type\": \"string\",\n                \"default\": \"cycle\"\n            },\n            \"startAngle\": {\n                \"title\": \"Start ticks angle\",\n                \"type\": \"number\",\n                \"default\": 45\n            },\n            \"ticksAngle\": {\n                \"title\": \"Ticks angle\",\n                \"type\": \"number\",\n                \"default\": 270\n            },\n            \"needleCircleSize\": {\n                \"title\": \"Needle circle size\",\n                \"type\": \"number\",\n                \"default\": 10\n            }\n        },\n        \"required\": []\n    },\n    \"form\": [\n        \"startAngle\",\n        \"ticksAngle\",\n        \"needleCircleSize\",\n        \"minValue\",\n        \"maxValue\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"units\",\n        \"majorTicksCount\",\n        \"minorTicks\",\n        \"valueBox\",\n        \"valueInt\",\n        \"valueDec\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorPlate\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMajorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMinorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedle\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowUp\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowDown\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRect\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRectEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxBackground\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxShadow\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"highlights\",\n            \"items\": [\n                \"highlights[].from\",\n                \"highlights[].to\",\n                {\n                    \"key\": \"highlights[].color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        \"highlightsWidth\",\n        \"showBorder\",\n        {\n            \"key\": \"numbersFont\",\n            \"items\": [\n                \"numbersFont.family\",\n                \"numbersFont.size\",\n                {\n                   \"key\": \"numbersFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"numbersFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"numbersFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"unitsFont\",\n            \"items\": [\n                \"unitsFont.family\",\n                \"unitsFont.size\",\n                {\n                   \"key\": \"unitsFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"unitsFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"unitsFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                },\n                {\n                    \"key\": \"valueFont.shadowColor\",\n                    \"type\": \"color\"\n                }\n            ]\n        },        \n        \"animation\",\n        \"animationDuration\",\n        {\n            \"key\": \"animationRule\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \"quad\",\n                    \"label\": \"Quad\"\n                },\n                {\n                    \"value\": \"quint\",\n                    \"label\": \"Quint\"\n                },\n                {\n                    \"value\": \"cycle\",\n                    \"label\": \"Cycle\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                },\n                {\n                    \"value\": \"elastic\",\n                    \"label\": \"Elastic\"\n                },\n                {\n                    \"value\": \"dequad\",\n                    \"label\": \"Dequad\"\n                },\n                {\n                    \"value\": \"dequint\",\n                    \"label\": \"Dequint\"\n                },\n                {\n                    \"value\": \"decycle\",\n                    \"label\": \"Decycle\"\n                },\n                {\n                    \"value\": \"debounce\",\n                    \"label\": \"Debounce\"\n                },\n                {\n                    \"value\": \"delastic\",\n                    \"label\": \"Delastic\"\n                }\n            ]\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 50 - 25;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 220) {\\n\\tvalue = 220;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":180,\"startAngle\":45,\"ticksAngle\":270,\"showBorder\":false,\"defaultColor\":\"#e65100\",\"needleCircleSize\":7,\"highlights\":[{\"from\":80,\"to\":120,\"color\":\"#fdd835\"},{\"color\":\"#e57373\",\"from\":120,\"to\":180}],\"showUnitTitle\":false,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":2,\"valueInt\":3,\"minValue\":0,\"valueDec\":0,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":1500,\"animationRule\":\"linear\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"colorNeedleShadowDown\":\"rgba(188, 143, 143, 0.78)\",\"units\":\"MPH\",\"majorTicksCount\":9,\"numbersFont\":{\"family\":\"RobotoDraft\",\"size\":22,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":24,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#888\"},\"unitsFont\":{\"family\":\"RobotoDraft\",\"size\":28,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"size\":32,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\",\"family\":\"Segment7Standard\"},\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\"},\"title\":\"Speed gauge - Canvas Gauges\"}"}',
+'Speed gauge - Canvas Gauges' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'analogue_gauges', 'temperature_gauge_canvas_gauges',
+'{"type":"latest","sizeX":7,"sizeY":3,"resources":[],"templateHtml":"<canvas id=\"linearGauge\"></canvas>\n","templateCss":"","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbAnalogueLinearGauge(containerElement, settings, data, ''linearGauge'');    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged) {\n    gauge.redraw(width, height, data, sizeChanged);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },\n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"units\": {\n                \"title\": \"Units\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"majorTicksCount\": {\n                \"title\": \"Major ticks count\",\n                \"type\": \"number\",\n                \"default\": null\n            },\n            \"minorTicks\": {\n                \"title\": \"Minor ticks count\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"valueBox\": {\n                \"title\": \"Show value box\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"valueInt\": {\n                \"title\": \"Digits count for integer part of value\",\n                \"type\": \"number\",\n                \"default\": 3\n            },\n            \"valueDec\": {\n                \"title\": \"Digits count for decimal part of value\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorPlate\": {\n                \"title\": \"Plate color\",\n                \"type\": \"string\",\n                \"default\": \"#fff\"\n            },\n            \"colorMajorTicks\": {\n                \"title\": \"Major ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#444\"\n            },\n            \"colorMinorTicks\": {\n                \"title\": \"Minor ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorNeedle\": {\n                \"title\": \"Needle color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleEnd\": {\n                \"title\": \"Needle color - end gradient\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleShadowUp\": {\n                \"title\": \"Upper half of the needle shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(2,255,255,0.2)\"\n            },\n            \"colorNeedleShadowDown\": {\n                \"title\": \"Drop shadow needle color.\",\n                \"type\": \"string\",\n                \"default\": \"rgba(188,143,143,0.45)\"\n            },\n            \"colorValueBoxRect\": {\n                \"title\": \"Value box rectangle stroke color\",\n                \"type\": \"string\",\n                \"default\": \"#888\"\n            },\n            \"colorValueBoxRectEnd\": {\n                \"title\": \"Value box rectangle stroke color - end gradient\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorValueBoxBackground\": {\n                \"title\": \"Value box background color\",\n                \"type\": \"string\",\n                \"default\": \"#babab2\"\n            },\n            \"colorValueBoxShadow\": {\n                \"title\": \"Value box shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(0,0,0,1)\"\n            },\n            \"highlights\": {\n                \"title\": \"Highlights\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Highlight\",\n                  \"type\": \"object\",\n                  \"properties\": {\n                    \"from\": {\n                      \"title\": \"From\",\n                      \"type\": \"number\"\n                    },\n                    \"to\": {\n                      \"title\": \"To\",\n                      \"type\": \"number\"\n                    },\n                    \"color\": {\n                      \"title\": \"Color\",\n                      \"type\": \"string\"\n                    }\n                  }\n                }\n            },\n            \"highlightsWidth\": {\n                \"title\": \"Highlights width\",\n                \"type\": \"number\",\n                \"default\": 15\n            },\n            \"showBorder\": {\n                \"title\": \"Show border\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"numbersFont\": {\n                \"title\": \"Tick numbers font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"titleFont\": {\n                \"title\": \"Title text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 24\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"unitsFont\": {\n                \"title\": \"Units text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 22\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Value text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 40\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#444\"\n                    },\n                    \"shadowColor\": {\n                        \"title\": \"Shadow color\",\n                        \"type\": \"string\",\n                        \"default\": \"rgba(0,0,0,0.3)\"\n                    }\n                }\n            },\n            \"animation\": {\n                \"title\": \"Enable animation\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"animationDuration\": {\n                \"title\": \"Animation duration\",\n                \"type\": \"number\",\n                \"default\": 500\n            },\n            \"animationRule\": {\n                \"title\": \"Animation rule\",\n                \"type\": \"string\",\n                \"default\": \"cycle\"\n            },\n            \"barStrokeWidth\": {\n                \"title\": \"Bar stroke width\",\n                \"type\": \"number\",\n                \"default\": 2.5\n            },\n            \"colorBarStroke\": {\n                \"title\": \"Bar stroke color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorBar\": {\n                \"title\": \"Bar background color\",\n                \"type\": \"string\",\n                \"default\": \"#fff\"\n            },\n            \"colorBarEnd\": {\n                \"title\": \"Bar background color - end gradient\",\n                \"type\": \"string\",\n                \"default\": \"#ddd\"\n            },\n            \"colorBarProgress\": {\n                \"title\": \"Progress bar color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorBarProgressEnd\": {\n                \"title\": \"Progress bar color - end gradient\",\n                \"type\": \"string\",\n                \"default\": null\n            }        \n            \n        },\n        \"required\": []\n    },\n    \"form\": [\n        \"barStrokeWidth\",\n        {\n            \"key\": \"colorBarStroke\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorBar\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorBarEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorBarProgress\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorBarProgressEnd\",\n            \"type\": \"color\"\n        },\n        \"minValue\",\n        \"maxValue\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"units\",\n        \"majorTicksCount\",\n        \"minorTicks\",\n        \"valueBox\",\n        \"valueInt\",\n        \"valueDec\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorPlate\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMajorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMinorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedle\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowUp\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowDown\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRect\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRectEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxBackground\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxShadow\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"highlights\",\n            \"items\": [\n                \"highlights[].from\",\n                \"highlights[].to\",\n                {\n                    \"key\": \"highlights[].color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        \"highlightsWidth\",\n        \"showBorder\",\n        {\n            \"key\": \"numbersFont\",\n            \"items\": [\n                \"numbersFont.family\",\n                \"numbersFont.size\",\n                {\n                   \"key\": \"numbersFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"numbersFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"numbersFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"unitsFont\",\n            \"items\": [\n                \"unitsFont.family\",\n                \"unitsFont.size\",\n                {\n                   \"key\": \"unitsFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"unitsFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"unitsFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                },\n                {\n                    \"key\": \"valueFont.shadowColor\",\n                    \"type\": \"color\"\n                }\n            ]\n        },        \n        \"animation\",\n        \"animationDuration\",\n        {\n            \"key\": \"animationRule\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \"quad\",\n                    \"label\": \"Quad\"\n                },\n                {\n                    \"value\": \"quint\",\n                    \"label\": \"Quint\"\n                },\n                {\n                    \"value\": \"cycle\",\n                    \"label\": \"Cycle\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                },\n                {\n                    \"value\": \"elastic\",\n                    \"label\": \"Elastic\"\n                },\n                {\n                    \"value\": \"dequad\",\n                    \"label\": \"Dequad\"\n                },\n                {\n                    \"value\": \"dequint\",\n                    \"label\": \"Dequint\"\n                },\n                {\n                    \"value\": \"decycle\",\n                    \"label\": \"Decycle\"\n                },\n                {\n                    \"value\": \"debounce\",\n                    \"label\": \"Debounce\"\n                },\n                {\n                    \"value\": \"delastic\",\n                    \"label\": \"Delastic\"\n                }\n            ]\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 30 - 15;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":100,\"defaultColor\":\"#e64a19\",\"barStrokeWidth\":2.5,\"colorBar\":\"rgba(255, 255, 255, 0.4)\",\"colorBarEnd\":\"rgba(221, 221, 221, 0.38)\",\"showUnitTitle\":true,\"minorTicks\":2,\"valueBox\":true,\"valueInt\":3,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"colorNeedleShadowUp\":\"rgba(2,255,255,0.2)\",\"colorNeedleShadowDown\":\"rgba(188,143,143,0.45)\",\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\",\"highlightsWidth\":10,\"animation\":true,\"animationDuration\":1500,\"animationRule\":\"linear\",\"showBorder\":false,\"majorTicksCount\":8,\"numbersFont\":{\"family\":\"Arial\",\"size\":18,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":24,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#78909c\"},\"unitsFont\":{\"family\":\"RobotoDraft\",\"size\":26,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#37474f\"},\"valueFont\":{\"family\":\"RobotoDraft\",\"size\":40,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#444\",\"shadowColor\":\"rgba(0,0,0,0.3)\"},\"minValue\":-60,\"highlights\":[{\"from\":0,\"to\":20,\"color\":\"#90caf9\"},{\"from\":20,\"to\":40,\"color\":\"rgba(144, 202, 249, 0.66)\"},{\"from\":40,\"to\":60,\"color\":\"rgba(144, 202, 249, 0.33)\"},{\"from\":60,\"to\":80,\"color\":\"rgba(244, 67, 54, 0.2)\"},{\"from\":80,\"to\":100,\"color\":\"rgba(244, 67, 54, 0.4)\"},{\"from\":100,\"to\":120,\"color\":\"rgba(244, 67, 54, 0.6)\"},{\"from\":120,\"to\":140,\"color\":\"rgba(244, 67, 54, 0.8)\"},{\"from\":140,\"to\":160,\"color\":\"#f44336\"}],\"unitTitle\":\"Temperature\",\"units\":\"°C\",\"colorBarProgress\":\"#90caf9\",\"colorBarProgressEnd\":\"#f44336\",\"colorBarStroke\":\"#b0bec5\",\"valueDec\":1},\"title\":\"Temperature gauge - Canvas Gauges\"}"}',
+'Temperature gauge - Canvas Gauges' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'gpio_widgets', 'gpio_panel',
+'{"type":"latest","sizeX":5,"sizeY":2,"resources":[],"templateHtml":"<div class=\"gpio-panel\" style=\"height: 100%;\">\n    <section layout=\"row\" ng-repeat=\"row in rows\">\n        <section flex layout=\"row\" ng-repeat=\"cell in row\">\n            <section layout=\"row\" flex ng-if=\"cell\" layout-align=\"{{$index===0 ? ''end center'' : ''start center''}}\">\n                <span class=\"gpio-left-label\" ng-show=\"$index===0\">{{ cell.label }}</span>\n                <section layout=\"row\" class=\"led-panel\" ng-class=\"$index===0 ? ''col-0'' : ''col-1''\"\n                      style=\"background-color: {{ ledPanelBackgroundColor }};\">\n                    <span class=\"pin\" ng-show=\"$index===0\">{{cell.pin}}</span>\n                    <span class=\"led-container\">\n                        <tb-led-light size=\"prefferedRowHeight\"\n                                      color-on=\"cell.colorOn\"\n                                      color-off=\"cell.colorOff\"\n                                      off-opacity=\"''0.9''\"\n                                      tb-enabled=\"cell.enabled\">\n                        </tb-led-light>\n                    </span>\n                    <span class=\"pin\" ng-show=\"$index===1\">{{cell.pin}}</span>\n                </section>\n                <span class=\"gpio-right-label\" ng-show=\"$index===1\">{{ cell.label }}</span>\n            </section>\n            <section layout=\"row\" flex ng-if=\"!cell\">\n                <span flex ng-show=\"$index===0\"></span>\n                <span class=\"led-panel\"\n                      style=\"background-color: {{ ledPanelBackgroundColor }};\"></span>\n                <span flex ng-show=\"$index===1\"></span>\n            </section>\n        </section>\n    </section>                            \n</div>","templateCss":".error {\n    font-size: 14px !important;\n    color: maroon;/*rgb(250,250,250);*/\n    background-color: transparent;\n    padding: 6px;\n}\n\n.error span {\n    margin: auto;\n}\n\n.gpio-panel {\n    padding-top: 10px;\n    white-space: nowrap;\n}\n\n.gpio-panel tb-led-light > div {\n    margin: auto;\n}\n\n.led-panel {\n    margin: 0;\n    width: 66px;\n    min-width: 66px;\n}\n\n.led-container {\n    width: 48px;\n    min-width: 48px;\n}\n\n.pin {\n    margin-top: auto;\n    margin-bottom: auto;\n    color: white;\n    font-size: 12px;\n    width: 16px;\n    min-width: 16px;\n}\n\n.led-panel.col-0 .pin {\n    margin-left: auto;\n    padding-left: 2px;\n    text-align: right;\n}\n\n.led-panel.col-1 .pin {\n    margin-right: auto;\n    \n    text-align: left;\n}\n\n.gpio-left-label {\n    margin-right: 8px;\n}\n\n.gpio-right-label {\n    margin-left: 8px;\n}","controllerScript":"\nfns.init = function(containerElement, settings, datasources, data, scope, controlApi) {\n    \n    var i, gpio;\n    \n    scope.gpioList = [];\n    scope.gpioByPin = {};\n    for (var g in settings.gpioList) {\n        gpio = settings.gpioList[g];\n        scope.gpioList.push(\n            {\n                row: gpio.row,\n                col: gpio.col,\n                pin: gpio.pin,\n                label: gpio.label,\n                enabled: false,\n                colorOn: tinycolor(gpio.color).lighten(20).toHexString(),\n                colorOff: tinycolor(gpio.color).darken().toHexString()\n            }\n        );\n        scope.gpioByPin[gpio.pin] = scope.gpioList[scope.gpioList.length-1];\n    }\n\n    scope.ledPanelBackgroundColor = settings.ledPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n    scope.gpioCells = {};\n    var rowCount = 0;\n    for (i = 0; i < scope.gpioList.length; i++) {\n        gpio = scope.gpioList[i];\n        scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n        rowCount = Math.max(rowCount, gpio.row+1);\n    }\n    \n    scope.prefferedRowHeight = 32;\n    scope.rows = [];\n    for (i = 0; i < rowCount; i++) {\n        var row = [];\n        for (var c =0; c<2;c++) {\n            if (scope.gpioCells[i+''_''+c]) {\n                row[c] = scope.gpioCells[i+''_''+c];\n            } else {\n                row[c] = null;\n            }\n        }\n        scope.rows.push(row);\n    }\n\n};\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged, scope) {\n    \n    if (sizeChanged) {\n        var rowCount = scope.rows.length;\n        var prefferedRowHeight = (height - 35)/rowCount;\n        prefferedRowHeight = Math.min(32, prefferedRowHeight);\n        prefferedRowHeight = Math.max(12, prefferedRowHeight);\n        scope.$apply(function(scope) {\n            scope.prefferedRowHeight = prefferedRowHeight;\n        });\n        var ratio = prefferedRowHeight/32;\n        \n        var leftLabels = $(''.gpio-left-label'', containerElement);\n        leftLabels.css(''font-size'', 16*ratio+''px'');\n        var rightLabels = $(''.gpio-right-label'', containerElement);\n        rightLabels.css(''font-size'', 16*ratio+''px'');\n        var pins = $(''.pin'', containerElement);\n        var pinsFontSize = Math.max(9, 12*ratio);\n        pins.css(''font-size'', pinsFontSize+''px'');\n    }\n    \n    var changed = false;\n    for (var d in data) {\n        var cellData = data[d];\n        var dataKey = cellData.dataKey;\n        var gpio = scope.gpioByPin[dataKey.label];\n        if (gpio) {\n            var enabled = false;\n            if (cellData.data.length > 0) {\n                var tvPair = cellData.data[cellData.data.length - 1];\n                enabled = (tvPair[1] === true || tvPair[1] === ''true'');\n            }\n            if (gpio.enabled != enabled) {\n                changed = true;\n                gpio.enabled = enabled;\n            }\n        }\n    }\n    if (changed) {\n        scope.$apply();\n    }\n};\n\nfns.destroy = function() {\n};","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"gpioList\": {\n                \"title\": \"Gpio leds\",\n                \"type\": \"array\",\n                \"minItems\" : 1,\n                \"items\": {\n                    \"title\": \"Gpio led\",\n                    \"type\": \"object\",\n                    \"properties\": {\n                        \"pin\": {\n                            \"title\": \"Pin\",\n                            \"type\": \"number\"\n                        },\n                        \"label\": {\n                            \"title\": \"Label\",\n                            \"type\": \"string\"\n                        },\n                        \"row\": {\n                            \"title\": \"Row\",\n                            \"type\": \"number\"\n                        },\n                        \"col\": {\n                            \"title\": \"Column\",\n                            \"type\": \"number\"\n                        },\n                        \"color\": {\n                            \"title\": \"Color\",\n                            \"type\": \"string\",\n                            \"default\": \"red\"\n                        }\n                    },\n                    \"required\": [\"pin\", \"label\", \"row\", \"col\", \"color\"]\n                }\n            },\n            \"ledPanelBackgroundColor\": {\n                \"title\": \"LED panel background color\",\n                \"type\": \"string\",\n                \"default\": \"#008a00\"\n            } \n        },\n        \"required\": [\"gpioList\", \n                     \"ledPanelBackgroundColor\"]\n    },\n    \"form\": [\n        {\n            \"key\": \"gpioList\",\n            \"items\": [\n                \"gpioList[].pin\",\n                \"gpioList[].label\",\n                \"gpioList[].row\",\n                \"gpioList[].col\",\n                {\n                    \"key\": \"gpioList[].color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"ledPanelBackgroundColor\",\n            \"type\": \"color\"\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"gpioList\":[{\"pin\":1,\"label\":\"GPIO 1\",\"row\":0,\"col\":0,\"color\":\"#008000\",\"_uniqueKey\":0},{\"pin\":2,\"label\":\"GPIO 2\",\"row\":0,\"col\":1,\"color\":\"#ffff00\",\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 3\",\"row\":1,\"col\":0,\"color\":\"#cf006f\",\"_uniqueKey\":2}],\"ledPanelBackgroundColor\":\"#b71c1c\"},\"title\":\"Basic GPIO Panel\",\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"1\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.22518255793320163,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"2\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.7008206860666621,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"3\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.42600325102193426,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 1000;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}}}"}',
+'Basic GPIO Panel' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'gpio_widgets', 'basic_gpio_control',
+'{"type":"rpc","sizeX":4,"sizeY":2,"resources":[],"templateHtml":"<fieldset class=\"gpio-panel\" ng-disabled=\"!rpcEnabled || executingRpcRequest\" style=\"height: 100%;\">\n    <section class=\"gpio-row\" layout=\"row\" ng-repeat=\"row in rows track by $index\" \n            ng-style=\"{''height'': prefferedRowHeight+''px''}\">\n        <section flex layout=\"row\" ng-repeat=\"cell in row track by $index\">\n            <section layout=\"row\" flex ng-if=\"cell\" layout-align=\"{{$index===0 ? ''end center'' : ''start center''}}\">\n                <span class=\"gpio-left-label\" ng-show=\"$index===0\">{{ cell.label }}</span>\n                <section layout=\"row\" class=\"switch-panel\" layout-align=\"start center\" ng-class=\"$index===0 ? ''col-0'' : ''col-1''\"\n                      ng-style=\"{''height'': prefferedRowHeight+''px'', ''backgroundColor'': ''{{ switchPanelBackgroundColor }}''}\">\n                    <span class=\"pin\" ng-show=\"$index===0\">{{cell.pin}}</span>\n                    <span flex ng-show=\"$index===1\"></span>\n                    <md-switch\n                        aria-label=\"{{ cell.label }}\"\n                        ng-disabled=\"!rpcEnabled || executingRpcRequest\"\n                        ng-model=\"cell.enabled\" \n                        ng-change=\"cell.enabled = !cell.enabled\" \n                        ng-click=\"gpioClick($event, cell)\">\n                    </md-switch>\n                    <span flex ng-show=\"$index===0\"></span>\n                    <span class=\"pin\" ng-show=\"$index===1\">{{cell.pin}}</span>\n                </section>\n                <span class=\"gpio-right-label\" ng-show=\"$index===1\">{{ cell.label }}</span>\n            </section>\n            <section layout=\"row\" flex ng-if=\"!cell\">\n                <span flex ng-show=\"$index===0\"></span>\n                <span class=\"switch-panel\"\n                      ng-style=\"{''height'': prefferedRowHeight+''px'', ''backgroundColor'': ''{{ switchPanelBackgroundColor }}''}\"></span>\n                <span flex ng-show=\"$index===1\"></span>\n            </section>\n        </section>\n    </section>                            \n    <span class=\"error\" style=\"position: absolute; bottom: 5px;\" ng-show=\"rpcErrorText\">{{rpcErrorText}}</span>\n    <md-progress-linear ng-show=\"executingRpcRequest\" style=\"position: absolute; bottom: 0;\" md-mode=\"indeterminate\"></md-progress-linear>    \n</fieldset>","templateCss":".error {\n    font-size: 14px !important;\n    color: maroon;/*rgb(250,250,250);*/\n    background-color: transparent;\n    padding: 6px;\n}\n\n.error span {\n    margin: auto;\n}\n\n.gpio-panel {\n    padding-top: 10px;\n    white-space: nowrap;\n}\n\n.switch-panel {\n    margin: 0;\n    height: 32px;\n    width: 66px;\n    min-width: 66px;\n}\n\n.switch-panel md-switch {\n    margin: 0;\n    width: 36px;\n    min-width: 36px;\n}\n\n.switch-panel md-switch > div.md-container {\n    margin: 0;\n}\n\n.switch-panel.col-0 md-switch {\n    padding-left: 8px;\n    padding-right: 4px;\n}\n\n.switch-panel.col-1 md-switch {\n    padding-left: 4px;\n    padding-right: 8px;\n}\n\n.gpio-row {\n    height: 32px;\n}\n\n.pin {\n    margin-top: auto;\n    margin-bottom: auto;\n    color: white;\n    font-size: 12px;\n    width: 16px;\n    min-width: 16px;\n}\n\n.switch-panel.col-0 .pin {\n    margin-left: auto;\n    padding-left: 2px;\n    text-align: right;\n}\n\n.switch-panel.col-1 .pin {\n    margin-right: auto;\n    \n    text-align: left;\n}\n\n.gpio-left-label {\n    margin-right: 8px;\n}\n\n.gpio-right-label {\n    margin-left: 8px;\n}","controllerScript":"\nfns.init = function(containerElement, settings, datasources, data, scope, controlApi) {\n    \n    var i, gpio;\n    \n    scope.gpioList = [];\n    for (var g in settings.gpioList) {\n        gpio = settings.gpioList[g];\n        scope.gpioList.push(\n            {\n                row: gpio.row,\n                col: gpio.col,\n                pin: gpio.pin,\n                label: gpio.label,\n                enabled: false\n            }\n        );\n    }\n\n    scope.requestTimeout = settings.requestTimeout || 1000;\n\n    scope.switchPanelBackgroundColor = settings.switchPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n    scope.gpioStatusRequest = {\n        method: \"getGpioStatus\",\n        paramsBody: \"{}\"\n    };\n    \n    if (settings.gpioStatusRequest) {\n        scope.gpioStatusRequest.method = settings.gpioStatusRequest.method || scope.gpioStatusRequest.method;\n        scope.gpioStatusRequest.paramsBody = settings.gpioStatusRequest.paramsBody || scope.gpioStatusRequest.paramsBody;\n    }\n    \n    scope.gpioStatusChangeRequest = {\n        method: \"setGpioStatus\",\n        paramsBody: \"{\\n   \\\"pin\\\": \\\"{$pin}\\\",\\n   \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n    };\n    \n    if (settings.gpioStatusChangeRequest) {\n        scope.gpioStatusChangeRequest.method = settings.gpioStatusChangeRequest.method || scope.gpioStatusChangeRequest.method;\n        scope.gpioStatusChangeRequest.paramsBody = settings.gpioStatusChangeRequest.paramsBody || scope.gpioStatusChangeRequest.paramsBody;\n    }\n    \n    scope.parseGpioStatusFunction = \"return body[pin] === true;\";\n    \n    if (settings.parseGpioStatusFunction && settings.parseGpioStatusFunction.length > 0) {\n        scope.parseGpioStatusFunction = settings.parseGpioStatusFunction;\n    }\n    \n    scope.parseGpioStatusFunction = new Function(\"body, pin\", scope.parseGpioStatusFunction);\n    \n    function requestGpioStatus() {\n        controlApi.sendTwoWayCommand(scope.gpioStatusRequest.method, \n                            scope.gpioStatusRequest.paramsBody, \n                            scope.requestTimeout)\n            .then(\n                function success(responseBody) {\n                    for (var g in scope.gpioList) {\n                        var gpio = scope.gpioList[g];\n                        var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n                        gpio.enabled = enabled;                        \n                    }\n                }\n            );\n    }\n    \n    function changeGpioStatus(gpio) {\n        var pin = gpio.pin + '''';\n        var enabled = !gpio.enabled;\n        enabled = enabled === true ? ''true'' : ''false'';\n        var paramsBody = scope.gpioStatusChangeRequest.paramsBody;\n        var requestBody = JSON.parse(paramsBody.replace(\"\\\"{$pin}\\\"\", pin).replace(\"\\\"{$enabled}\\\"\", enabled));\n        controlApi.sendTwoWayCommand(scope.gpioStatusChangeRequest.method, \n                                    requestBody, scope.requestTimeout)\n                    .then(\n                        function success(responseBody) {\n                            var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n                            gpio.enabled = enabled;\n                        }\n                    );\n    }\n    \n    scope.gpioCells = {};\n    var rowCount = 0;\n    for (i = 0; i < scope.gpioList.length; i++) {\n        gpio = scope.gpioList[i];\n        scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n        rowCount = Math.max(rowCount, gpio.row+1);\n    }\n    \n    scope.prefferedRowHeight = 32;\n    scope.rows = [];\n    for (i = 0; i < rowCount; i++) {\n        var row = [];\n        for (var c =0; c<2;c++) {\n            if (scope.gpioCells[i+''_''+c]) {\n                row[c] = scope.gpioCells[i+''_''+c];\n            } else {\n                row[c] = null;\n            }\n        }\n        scope.rows.push(row);\n    }\n\n    scope.gpioClick = function($event, gpio) {\n        changeGpioStatus(gpio);\n    };\n\n    requestGpioStatus();\n    \n};\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged, scope) {\n    if (sizeChanged) {\n        var rowCount = scope.rows.length;\n        var prefferedRowHeight = (height - 35)/rowCount;\n        prefferedRowHeight = Math.min(32, prefferedRowHeight);\n        prefferedRowHeight = Math.max(12, prefferedRowHeight);\n        scope.$apply(function(scope) {\n            scope.prefferedRowHeight = prefferedRowHeight;\n        });\n        var ratio = prefferedRowHeight/32;\n        var switches = $(''md-switch'', containerElement);\n        switches.css(''height'', 30*ratio+''px'');\n        switches.css(''width'', 36*ratio+''px'');\n        switches.css(''min-width'', 36*ratio+''px'');\n        $(''.md-container'', switches).css(''height'', 24*ratio+''px'');\n        $(''.md-container'', switches).css(''width'', 36*ratio+''px'');\n        var bars = $(''.md-bar'', containerElement);\n        bars.css(''height'', 14*ratio+''px'');\n        bars.css(''width'', 34*ratio+''px'');\n        var thumbs = $(''.md-thumb'', containerElement);\n        thumbs.css(''height'', 20*ratio+''px'');\n        thumbs.css(''width'', 20*ratio+''px'');\n        \n        var leftLabels = $(''.gpio-left-label'', containerElement);\n        leftLabels.css(''font-size'', 16*ratio+''px'');\n        var rightLabels = $(''.gpio-right-label'', containerElement);\n        rightLabels.css(''font-size'', 16*ratio+''px'');\n        var pins = $(''.pin'', containerElement);\n        var pinsFontSize = Math.max(9, 12*ratio);\n        pins.css(''font-size'', pinsFontSize+''px'');\n    }\n};\n\nfns.destroy = function() {\n};","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"gpioList\": {\n                \"title\": \"Gpio switches\",\n                \"type\": \"array\",\n                \"minItems\" : 1,\n                \"items\": {\n                    \"title\": \"Gpio switch\",\n                    \"type\": \"object\",\n                    \"properties\": {\n                        \"pin\": {\n                            \"title\": \"Pin\",\n                            \"type\": \"number\"\n                        },\n                        \"label\": {\n                            \"title\": \"Label\",\n                            \"type\": \"string\"\n                        },\n                        \"row\": {\n                            \"title\": \"Row\",\n                            \"type\": \"number\"\n                        },\n                        \"col\": {\n                            \"title\": \"Column\",\n                            \"type\": \"number\"\n                        }\n                    },\n                    \"required\": [\"pin\", \"label\", \"row\", \"col\"]\n                }\n            },\n            \"requestTimeout\": {\n                \"title\": \"RPC request timeout\",\n                \"type\": \"number\",\n                \"default\": 500\n            },\n            \"switchPanelBackgroundColor\": {\n                \"title\": \"Switches panel background color\",\n                \"type\": \"string\",\n                \"default\": \"#008a00\"\n            },\n            \"gpioStatusRequest\": {\n                \"title\": \"GPIO status request\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"method\": {\n                        \"title\": \"Method name\",\n                        \"type\": \"string\",\n                        \"default\": \"getGpioStatus\"\n                    },\n                    \"paramsBody\": {\n                      \"title\": \"Method body\",\n                      \"type\": \"string\",\n                      \"default\": \"{}\"\n                    }\n                },\n                \"required\": [\"method\", \"paramsBody\"]\n            },\n            \"gpioStatusChangeRequest\": {\n                \"title\": \"GPIO status change request\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"method\": {\n                        \"title\": \"Method name\",\n                        \"type\": \"string\",\n                        \"default\": \"setGpioStatus\"\n                    },\n                    \"paramsBody\": {\n                      \"title\": \"Method body\",\n                      \"type\": \"string\",\n                      \"default\": \"{\\n   \\\"pin\\\": \\\"{$pin}\\\",\\n   \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n                    }\n                },\n                \"required\": [\"method\", \"paramsBody\"]\n            },\n            \"parseGpioStatusFunction\": {\n                \"title\": \"Parse gpio status function\",\n                \"type\": \"string\",\n                \"default\": \"return body[pin] === true;\"\n            } \n        },\n        \"required\": [\"gpioList\", \n                     \"requestTimeout\",\n                     \"switchPanelBackgroundColor\",\n                     \"gpioStatusRequest\",\n                     \"gpioStatusChangeRequest\",\n                     \"parseGpioStatusFunction\"]\n    },\n    \"form\": [\n        \"gpioList\",\n        \"requestTimeout\",\n        {\n            \"key\": \"switchPanelBackgroundColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gpioStatusRequest\",\n            \"items\": [\n                \"gpioStatusRequest.method\",\n                {\n                    \"key\": \"gpioStatusRequest.paramsBody\",\n                    \"type\": \"json\"\n                }\n            ]\n        },\n        {\n            \"key\": \"gpioStatusChangeRequest\",\n            \"items\": [\n                \"gpioStatusChangeRequest.method\",\n                {\n                    \"key\": \"gpioStatusChangeRequest.paramsBody\",\n                    \"type\": \"json\"\n                }\n            ]\n        },\n        {\n            \"key\": \"parseGpioStatusFunction\",\n            \"type\": \"javascript\"\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"targetDeviceAliases\":[],\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"parseGpioStatusFunction\":\"return body[pin] === true;\",\"gpioStatusChangeRequest\":{\"method\":\"setGpioStatus\",\"paramsBody\":\"{\\n   \\\"pin\\\": \\\"{$pin}\\\",\\n   \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"},\"requestTimeout\":500,\"switchPanelBackgroundColor\":\"#b71c1c\",\"gpioStatusRequest\":{\"method\":\"getGpioStatus\",\"paramsBody\":\"{}\"},\"gpioList\":[{\"pin\":1,\"label\":\"GPIO 1\",\"row\":0,\"col\":0,\"_uniqueKey\":0},{\"pin\":2,\"label\":\"GPIO 2\",\"row\":0,\"col\":1,\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 3\",\"row\":1,\"col\":0,\"_uniqueKey\":2}]},\"title\":\"Basic GPIO Control\"}"}',
+'Basic GPIO Control' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'gpio_widgets', 'raspberry_pi_gpio_panel',
+'{"type":"latest","sizeX":7,"sizeY":10.5,"resources":[],"templateHtml":"<div class=\"gpio-panel\" style=\"height: 100%;\">\n    <section layout=\"row\" ng-repeat=\"row in rows\">\n        <section flex layout=\"row\" ng-repeat=\"cell in row\">\n            <section layout=\"row\" flex ng-if=\"cell\" layout-align=\"{{$index===0 ? ''end center'' : ''start center''}}\">\n                <span class=\"gpio-left-label\" ng-show=\"$index===0\">{{ cell.label }}</span>\n                <section layout=\"row\" class=\"led-panel\" ng-class=\"$index===0 ? ''col-0'' : ''col-1''\"\n                      style=\"background-color: {{ ledPanelBackgroundColor }};\">\n                    <span class=\"pin\" ng-show=\"$index===0\">{{cell.pin}}</span>\n                    <span class=\"led-container\">\n                        <tb-led-light size=\"prefferedRowHeight\"\n                                      color-on=\"cell.colorOn\"\n                                      color-off=\"cell.colorOff\"\n                                      off-opacity=\"''0.9''\"\n                                      tb-enabled=\"cell.enabled\">\n                        </tb-led-light>\n                    </span>\n                    <span class=\"pin\" ng-show=\"$index===1\">{{cell.pin}}</span>\n                </section>\n                <span class=\"gpio-right-label\" ng-show=\"$index===1\">{{ cell.label }}</span>\n            </section>\n            <section layout=\"row\" flex ng-if=\"!cell\">\n                <span flex ng-show=\"$index===0\"></span>\n                <span class=\"led-panel\"\n                      style=\"background-color: {{ ledPanelBackgroundColor }};\"></span>\n                <span flex ng-show=\"$index===1\"></span>\n            </section>\n        </section>\n    </section>                            \n</div>","templateCss":".error {\n    font-size: 14px !important;\n    color: maroon;/*rgb(250,250,250);*/\n    background-color: transparent;\n    padding: 6px;\n}\n\n.error span {\n    margin: auto;\n}\n\n.gpio-panel {\n    padding-top: 10px;\n    white-space: nowrap;\n}\n\n.gpio-panel tb-led-light > div {\n    margin: auto;\n}\n\n.led-panel {\n    margin: 0;\n    width: 66px;\n    min-width: 66px;\n}\n\n.led-container {\n    width: 48px;\n    min-width: 48px;\n}\n\n.pin {\n    margin-top: auto;\n    margin-bottom: auto;\n    color: white;\n    font-size: 12px;\n    width: 16px;\n    min-width: 16px;\n}\n\n.led-panel.col-0 .pin {\n    margin-left: auto;\n    padding-left: 2px;\n    text-align: right;\n}\n\n.led-panel.col-1 .pin {\n    margin-right: auto;\n    \n    text-align: left;\n}\n\n.gpio-left-label {\n    margin-right: 8px;\n}\n\n.gpio-right-label {\n    margin-left: 8px;\n}","controllerScript":"\nfns.init = function(containerElement, settings, datasources, data, scope, controlApi) {\n    \n    var i, gpio;\n    \n    scope.gpioList = [];\n    scope.gpioByPin = {};\n    for (var g in settings.gpioList) {\n        gpio = settings.gpioList[g];\n        scope.gpioList.push(\n            {\n                row: gpio.row,\n                col: gpio.col,\n                pin: gpio.pin,\n                label: gpio.label,\n                enabled: false,\n                colorOn: tinycolor(gpio.color).lighten(20).toHexString(),\n                colorOff: tinycolor(gpio.color).darken().toHexString()\n            }\n        );\n        scope.gpioByPin[gpio.pin] = scope.gpioList[scope.gpioList.length-1];\n    }\n\n    scope.ledPanelBackgroundColor = settings.ledPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n    scope.gpioCells = {};\n    var rowCount = 0;\n    for (i = 0; i < scope.gpioList.length; i++) {\n        gpio = scope.gpioList[i];\n        scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n        rowCount = Math.max(rowCount, gpio.row+1);\n    }\n    \n    scope.prefferedRowHeight = 32;\n    scope.rows = [];\n    for (i = 0; i < rowCount; i++) {\n        var row = [];\n        for (var c =0; c<2;c++) {\n            if (scope.gpioCells[i+''_''+c]) {\n                row[c] = scope.gpioCells[i+''_''+c];\n            } else {\n                row[c] = null;\n            }\n        }\n        scope.rows.push(row);\n    }\n\n};\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged, scope) {\n    \n    if (sizeChanged) {\n        var rowCount = scope.rows.length;\n        var prefferedRowHeight = (height - 35)/rowCount;\n        prefferedRowHeight = Math.min(32, prefferedRowHeight);\n        prefferedRowHeight = Math.max(12, prefferedRowHeight);\n        scope.$apply(function(scope) {\n            scope.prefferedRowHeight = prefferedRowHeight;\n        });\n        var ratio = prefferedRowHeight/32;\n        \n        var leftLabels = $(''.gpio-left-label'', containerElement);\n        leftLabels.css(''font-size'', 16*ratio+''px'');\n        var rightLabels = $(''.gpio-right-label'', containerElement);\n        rightLabels.css(''font-size'', 16*ratio+''px'');\n        var pins = $(''.pin'', containerElement);\n        var pinsFontSize = Math.max(9, 12*ratio);\n        pins.css(''font-size'', pinsFontSize+''px'');\n    }\n    \n    var changed = false;\n    for (var d in data) {\n        var cellData = data[d];\n        var dataKey = cellData.dataKey;\n        var gpio = scope.gpioByPin[dataKey.label];\n        if (gpio) {\n            var enabled = false;\n            if (cellData.data.length > 0) {\n                var tvPair = cellData.data[cellData.data.length - 1];\n                enabled = (tvPair[1] === true || tvPair[1] === ''true'');\n            }\n            if (gpio.enabled != enabled) {\n                changed = true;\n                gpio.enabled = enabled;\n            }\n        }\n    }\n    if (changed) {\n        scope.$apply();\n    }\n};\n\nfns.destroy = function() {\n};","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"gpioList\": {\n                \"title\": \"Gpio leds\",\n                \"type\": \"array\",\n                \"minItems\" : 1,\n                \"items\": {\n                    \"title\": \"Gpio led\",\n                    \"type\": \"object\",\n                    \"properties\": {\n                        \"pin\": {\n                            \"title\": \"Pin\",\n                            \"type\": \"number\"\n                        },\n                        \"label\": {\n                            \"title\": \"Label\",\n                            \"type\": \"string\"\n                        },\n                        \"row\": {\n                            \"title\": \"Row\",\n                            \"type\": \"number\"\n                        },\n                        \"col\": {\n                            \"title\": \"Column\",\n                            \"type\": \"number\"\n                        },\n                        \"color\": {\n                            \"title\": \"Color\",\n                            \"type\": \"string\",\n                            \"default\": \"red\"\n                        }\n                    },\n                    \"required\": [\"pin\", \"label\", \"row\", \"col\", \"color\"]\n                }\n            },\n            \"ledPanelBackgroundColor\": {\n                \"title\": \"LED panel background color\",\n                \"type\": \"string\",\n                \"default\": \"#008a00\"\n            } \n        },\n        \"required\": [\"gpioList\", \n                     \"ledPanelBackgroundColor\"]\n    },\n    \"form\": [\n        {\n            \"key\": \"gpioList\",\n            \"items\": [\n                \"gpioList[].pin\",\n                \"gpioList[].label\",\n                \"gpioList[].row\",\n                \"gpioList[].col\",\n                {\n                    \"key\": \"gpioList[].color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"ledPanelBackgroundColor\",\n            \"type\": \"color\"\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"gpioList\":[{\"pin\":1,\"label\":\"3.3V\",\"row\":0,\"col\":0,\"color\":\"#fc9700\",\"_uniqueKey\":0},{\"pin\":2,\"label\":\"5V\",\"row\":0,\"col\":1,\"color\":\"#fb0000\",\"_uniqueKey\":1},{\"pin\":3,\"label\":\"GPIO 2 (I2C1_SDA)\",\"row\":1,\"col\":0,\"color\":\"#02fefb\",\"_uniqueKey\":2},{\"color\":\"#fb0000\",\"pin\":4,\"label\":\"5V\",\"row\":1,\"col\":1},{\"color\":\"#02fefb\",\"pin\":5,\"label\":\"GPIO 3 (I2C1_SCL)\",\"row\":2,\"col\":0},{\"color\":\"#000000\",\"pin\":6,\"label\":\"GND\",\"row\":2,\"col\":1},{\"color\":\"#00fd00\",\"pin\":7,\"label\":\"GPIO 4 (GPCLK0)\",\"row\":3,\"col\":0},{\"color\":\"#fdfb00\",\"pin\":8,\"label\":\"GPIO 14 (UART_TXD)\",\"row\":3,\"col\":1},{\"color\":\"#000000\",\"pin\":9,\"label\":\"GND\",\"row\":4,\"col\":0},{\"color\":\"#fdfb00\",\"pin\":10,\"label\":\"GPIO 15 (UART_RXD)\",\"row\":4,\"col\":1},{\"color\":\"#00fd00\",\"pin\":11,\"label\":\"GPIO 17\",\"row\":5,\"col\":0},{\"color\":\"#00fd00\",\"pin\":12,\"label\":\"GPIO 18\",\"row\":5,\"col\":1},{\"color\":\"#00fd00\",\"pin\":13,\"label\":\"GPIO 27\",\"row\":6,\"col\":0},{\"color\":\"#000000\",\"pin\":14,\"label\":\"GND\",\"row\":6,\"col\":1},{\"color\":\"#00fd00\",\"pin\":15,\"label\":\"GPIO 22\",\"row\":7,\"col\":0},{\"color\":\"#00fd00\",\"pin\":16,\"label\":\"GPIO 23\",\"row\":7,\"col\":1},{\"color\":\"#fc9700\",\"pin\":17,\"label\":\"3.3V\",\"row\":8,\"col\":0},{\"color\":\"#00fd00\",\"pin\":18,\"label\":\"GPIO 24\",\"row\":8,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":19,\"label\":\"GPIO 10 (SPI_MOSI)\",\"row\":9,\"col\":0},{\"color\":\"#000000\",\"pin\":20,\"label\":\"GND\",\"row\":9,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":21,\"label\":\"GPIO 9 (SPI_MISO)\",\"row\":10,\"col\":0},{\"color\":\"#00fd00\",\"pin\":22,\"label\":\"GPIO 25\",\"row\":10,\"col\":1},{\"color\":\"#fd01fd\",\"pin\":23,\"label\":\"GPIO 11 (SPI_SCLK)\",\"row\":11,\"col\":0},{\"color\":\"#fd01fd\",\"pin\":24,\"label\":\"GPIO 8 (SPI_CE0)\",\"row\":11,\"col\":1},{\"color\":\"#000000\",\"pin\":25,\"label\":\"GND\",\"row\":12,\"col\":0},{\"color\":\"#fd01fd\",\"pin\":26,\"label\":\"GPIO 7 (SPI_CE1)\",\"row\":12,\"col\":1},{\"color\":\"#ffffff\",\"pin\":27,\"label\":\"ID_SD\",\"row\":13,\"col\":0},{\"color\":\"#ffffff\",\"pin\":28,\"label\":\"ID_SC\",\"row\":13,\"col\":1},{\"color\":\"#00fd00\",\"pin\":29,\"label\":\"GPIO 5\",\"row\":14,\"col\":0},{\"color\":\"#000000\",\"pin\":30,\"label\":\"GND\",\"row\":14,\"col\":1},{\"color\":\"#00fd00\",\"pin\":31,\"label\":\"GPIO 6\",\"row\":15,\"col\":0},{\"color\":\"#00fd00\",\"pin\":32,\"label\":\"GPIO 12\",\"row\":15,\"col\":1},{\"color\":\"#00fd00\",\"pin\":33,\"label\":\"GPIO 13\",\"row\":16,\"col\":0},{\"color\":\"#000000\",\"pin\":34,\"label\":\"GND\",\"row\":16,\"col\":1},{\"color\":\"#00fd00\",\"pin\":35,\"label\":\"GPIO 19\",\"row\":17,\"col\":0},{\"color\":\"#00fd00\",\"pin\":36,\"label\":\"GPIO 16\",\"row\":17,\"col\":1},{\"color\":\"#00fd00\",\"pin\":37,\"label\":\"GPIO 26\",\"row\":18,\"col\":0},{\"color\":\"#00fd00\",\"pin\":38,\"label\":\"GPIO 20\",\"row\":18,\"col\":1},{\"color\":\"#000000\",\"pin\":39,\"label\":\"GND\",\"row\":19,\"col\":0},{\"color\":\"#00fd00\",\"pin\":40,\"label\":\"GPIO 21\",\"row\":19,\"col\":1}],\"ledPanelBackgroundColor\":\"#008a00\"},\"title\":\"Raspberry Pi GPIO Panel\",\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"7\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.22518255793320163,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"11\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.7008206860666621,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"12\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.42600325102193426,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 1000;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"13\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.48362241571415243,\"funcBody\":\"var period = time % 1500;\\nreturn period < 500;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"29\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.7217670147518815,\"funcBody\":\"var period = time % 1500;\\nreturn period >= 500 && period < 1000;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}}}"}',
+'Raspberry Pi GPIO Panel' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'gpio_widgets', 'raspberry_pi_gpio_control',
+'{"type":"rpc","sizeX":6,"sizeY":10.5,"resources":[],"templateHtml":"<fieldset class=\"gpio-panel\" ng-disabled=\"!rpcEnabled || executingRpcRequest\" style=\"height: 100%;\">\n    <section class=\"gpio-row\" layout=\"row\" ng-repeat=\"row in rows track by $index\" \n            ng-style=\"{''height'': prefferedRowHeight+''px''}\">\n        <section flex layout=\"row\" ng-repeat=\"cell in row track by $index\">\n            <section layout=\"row\" flex ng-if=\"cell\" layout-align=\"{{$index===0 ? ''end center'' : ''start center''}}\">\n                <span class=\"gpio-left-label\" ng-show=\"$index===0\">{{ cell.label }}</span>\n                <section layout=\"row\" class=\"switch-panel\" layout-align=\"start center\" ng-class=\"$index===0 ? ''col-0'' : ''col-1''\"\n                      ng-style=\"{''height'': prefferedRowHeight+''px'', ''backgroundColor'': ''{{ switchPanelBackgroundColor }}''}\">\n                    <span class=\"pin\" ng-show=\"$index===0\">{{cell.pin}}</span>\n                    <span flex ng-show=\"$index===1\"></span>\n                    <md-switch\n                        aria-label=\"{{ cell.label }}\"\n                        ng-disabled=\"!rpcEnabled || executingRpcRequest\"\n                        ng-model=\"cell.enabled\" \n                        ng-change=\"cell.enabled = !cell.enabled\" \n                        ng-click=\"gpioClick($event, cell)\">\n                    </md-switch>\n                    <span flex ng-show=\"$index===0\"></span>\n                    <span class=\"pin\" ng-show=\"$index===1\">{{cell.pin}}</span>\n                </section>\n                <span class=\"gpio-right-label\" ng-show=\"$index===1\">{{ cell.label }}</span>\n            </section>\n            <section layout=\"row\" flex ng-if=\"!cell\">\n                <span flex ng-show=\"$index===0\"></span>\n                <span class=\"switch-panel\"\n                      ng-style=\"{''height'': prefferedRowHeight+''px'', ''backgroundColor'': ''{{ switchPanelBackgroundColor }}''}\"></span>\n                <span flex ng-show=\"$index===1\"></span>\n            </section>\n        </section>\n    </section>                            \n    <span class=\"error\" style=\"position: absolute; bottom: 5px;\" ng-show=\"rpcErrorText\">{{rpcErrorText}}</span>\n    <md-progress-linear ng-show=\"executingRpcRequest\" style=\"position: absolute; bottom: 0;\" md-mode=\"indeterminate\"></md-progress-linear>    \n</fieldset>","templateCss":".error {\n    font-size: 14px !important;\n    color: maroon;/*rgb(250,250,250);*/\n    background-color: transparent;\n    padding: 6px;\n}\n\n.error span {\n    margin: auto;\n}\n\n.gpio-panel {\n    padding-top: 10px;\n    white-space: nowrap;\n}\n\n.switch-panel {\n    margin: 0;\n    height: 32px;\n    width: 66px;\n    min-width: 66px;\n}\n\n.switch-panel md-switch {\n    margin: 0;\n    width: 36px;\n    min-width: 36px;\n}\n\n.switch-panel md-switch > div.md-container {\n    margin: 0;\n}\n\n.switch-panel.col-0 md-switch {\n    margin-left: 8px;\n    margin-right: 4px;\n}\n\n.switch-panel.col-1 md-switch {\n    margin-left: 4px;\n    margin-right: 8px;\n}\n\n.gpio-row {\n    height: 32px;\n}\n\n.pin {\n    margin-top: auto;\n    margin-bottom: auto;\n    color: white;\n    font-size: 12px;\n    width: 16px;\n    min-width: 16px;\n}\n\n.switch-panel.col-0 .pin {\n    margin-left: auto;\n    padding-left: 2px;\n    text-align: right;\n}\n\n.switch-panel.col-1 .pin {\n    margin-right: auto;\n    \n    text-align: left;\n}\n\n.gpio-left-label {\n    margin-right: 8px;\n}\n\n.gpio-right-label {\n    margin-left: 8px;\n}","controllerScript":"\nfns.init = function(containerElement, settings, datasources, data, scope, controlApi) {\n    \n    var i, gpio;\n    \n    scope.gpioList = [];\n    for (var g in settings.gpioList) {\n        gpio = settings.gpioList[g];\n        scope.gpioList.push(\n            {\n                row: gpio.row,\n                col: gpio.col,\n                pin: gpio.pin,\n                label: gpio.label,\n                enabled: false\n            }\n        );\n    }\n\n    scope.requestTimeout = settings.requestTimeout || 1000;\n\n    scope.switchPanelBackgroundColor = settings.switchPanelBackgroundColor || tinycolor(''green'').lighten(2).toRgbString();\n\n    scope.gpioStatusRequest = {\n        method: \"getGpioStatus\",\n        paramsBody: \"{}\"\n    };\n    \n    if (settings.gpioStatusRequest) {\n        scope.gpioStatusRequest.method = settings.gpioStatusRequest.method || scope.gpioStatusRequest.method;\n        scope.gpioStatusRequest.paramsBody = settings.gpioStatusRequest.paramsBody || scope.gpioStatusRequest.paramsBody;\n    }\n    \n    scope.gpioStatusChangeRequest = {\n        method: \"setGpioStatus\",\n        paramsBody: \"{\\n   \\\"pin\\\": \\\"{$pin}\\\",\\n   \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n    };\n    \n    if (settings.gpioStatusChangeRequest) {\n        scope.gpioStatusChangeRequest.method = settings.gpioStatusChangeRequest.method || scope.gpioStatusChangeRequest.method;\n        scope.gpioStatusChangeRequest.paramsBody = settings.gpioStatusChangeRequest.paramsBody || scope.gpioStatusChangeRequest.paramsBody;\n    }\n    \n    scope.parseGpioStatusFunction = \"return body[pin] === true;\";\n    \n    if (settings.parseGpioStatusFunction && settings.parseGpioStatusFunction.length > 0) {\n        scope.parseGpioStatusFunction = settings.parseGpioStatusFunction;\n    }\n    \n    scope.parseGpioStatusFunction = new Function(\"body, pin\", scope.parseGpioStatusFunction);\n    \n    function requestGpioStatus() {\n        controlApi.sendTwoWayCommand(scope.gpioStatusRequest.method, \n                            scope.gpioStatusRequest.paramsBody, \n                            scope.requestTimeout)\n            .then(\n                function success(responseBody) {\n                    for (var g in scope.gpioList) {\n                        var gpio = scope.gpioList[g];\n                        var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n                        gpio.enabled = enabled;                        \n                    }\n                }\n            );\n    }\n    \n    function changeGpioStatus(gpio) {\n        var pin = gpio.pin + '''';\n        var enabled = !gpio.enabled;\n        enabled = enabled === true ? ''true'' : ''false'';\n        var paramsBody = scope.gpioStatusChangeRequest.paramsBody;\n        var requestBody = JSON.parse(paramsBody.replace(\"\\\"{$pin}\\\"\", pin).replace(\"\\\"{$enabled}\\\"\", enabled));\n        controlApi.sendTwoWayCommand(scope.gpioStatusChangeRequest.method, \n                                    requestBody, scope.requestTimeout)\n                    .then(\n                        function success(responseBody) {\n                            var enabled = scope.parseGpioStatusFunction.apply(this, [responseBody, gpio.pin]);\n                            gpio.enabled = enabled;\n                        }\n                    );\n    }\n    \n    scope.gpioCells = {};\n    var rowCount = 0;\n    for (i = 0; i < scope.gpioList.length; i++) {\n        gpio = scope.gpioList[i];\n        scope.gpioCells[gpio.row+''_''+gpio.col] = gpio;\n        rowCount = Math.max(rowCount, gpio.row+1);\n    }\n    \n    scope.prefferedRowHeight = 32;\n    scope.rows = [];\n    for (i = 0; i < rowCount; i++) {\n        var row = [];\n        for (var c =0; c<2;c++) {\n            if (scope.gpioCells[i+''_''+c]) {\n                row[c] = scope.gpioCells[i+''_''+c];\n            } else {\n                row[c] = null;\n            }\n        }\n        scope.rows.push(row);\n    }\n\n    scope.gpioClick = function($event, gpio) {\n        changeGpioStatus(gpio);\n    };\n\n    requestGpioStatus();\n    \n};\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged, scope) {\n    if (sizeChanged) {\n        var rowCount = scope.rows.length;\n        var prefferedRowHeight = (height - 35)/rowCount;\n        prefferedRowHeight = Math.min(32, prefferedRowHeight);\n        prefferedRowHeight = Math.max(12, prefferedRowHeight);\n        scope.$apply(function(scope) {\n            scope.prefferedRowHeight = prefferedRowHeight;\n        });\n        var ratio = prefferedRowHeight/32;\n        var switches = $(''md-switch'', containerElement);\n        switches.css(''height'', 30*ratio+''px'');\n        switches.css(''width'', 36*ratio+''px'');\n        switches.css(''min-width'', 36*ratio+''px'');\n        $(''.md-container'', switches).css(''height'', 24*ratio+''px'');\n        $(''.md-container'', switches).css(''width'', 36*ratio+''px'');\n        var bars = $(''.md-bar'', containerElement);\n        bars.css(''height'', 14*ratio+''px'');\n        bars.css(''width'', 34*ratio+''px'');\n        var thumbs = $(''.md-thumb'', containerElement);\n        thumbs.css(''height'', 20*ratio+''px'');\n        thumbs.css(''width'', 20*ratio+''px'');\n        \n        var leftLabels = $(''.gpio-left-label'', containerElement);\n        leftLabels.css(''font-size'', 16*ratio+''px'');\n        var rightLabels = $(''.gpio-right-label'', containerElement);\n        rightLabels.css(''font-size'', 16*ratio+''px'');\n        var pins = $(''.pin'', containerElement);\n        var pinsFontSize = Math.max(9, 12*ratio);\n        pins.css(''font-size'', pinsFontSize+''px'');\n    }\n};\n\nfns.destroy = function() {\n};","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"gpioList\": {\n                \"title\": \"Gpio switches\",\n                \"type\": \"array\",\n                \"minItems\" : 1,\n                \"items\": {\n                    \"title\": \"Gpio switch\",\n                    \"type\": \"object\",\n                    \"properties\": {\n                        \"pin\": {\n                            \"title\": \"Pin\",\n                            \"type\": \"number\"\n                        },\n                        \"label\": {\n                            \"title\": \"Label\",\n                            \"type\": \"string\"\n                        },\n                        \"row\": {\n                            \"title\": \"Row\",\n                            \"type\": \"number\"\n                        },\n                        \"col\": {\n                            \"title\": \"Column\",\n                            \"type\": \"number\"\n                        }\n                    },\n                    \"required\": [\"pin\", \"label\", \"row\", \"col\"]\n                }\n            },\n            \"requestTimeout\": {\n                \"title\": \"RPC request timeout\",\n                \"type\": \"number\",\n                \"default\": 500\n            },\n            \"switchPanelBackgroundColor\": {\n                \"title\": \"Switches panel background color\",\n                \"type\": \"string\",\n                \"default\": \"#008a00\"\n            },\n            \"gpioStatusRequest\": {\n                \"title\": \"GPIO status request\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"method\": {\n                        \"title\": \"Method name\",\n                        \"type\": \"string\",\n                        \"default\": \"getGpioStatus\"\n                    },\n                    \"paramsBody\": {\n                      \"title\": \"Method body\",\n                      \"type\": \"string\",\n                      \"default\": \"{}\"\n                    }\n                },\n                \"required\": [\"method\", \"paramsBody\"]\n            },\n            \"gpioStatusChangeRequest\": {\n                \"title\": \"GPIO status change request\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"method\": {\n                        \"title\": \"Method name\",\n                        \"type\": \"string\",\n                        \"default\": \"setGpioStatus\"\n                    },\n                    \"paramsBody\": {\n                      \"title\": \"Method body\",\n                      \"type\": \"string\",\n                      \"default\": \"{\\n   \\\"pin\\\": \\\"{$pin}\\\",\\n   \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"\n                    }\n                },\n                \"required\": [\"method\", \"paramsBody\"]\n            },\n            \"parseGpioStatusFunction\": {\n                \"title\": \"Parse gpio status function\",\n                \"type\": \"string\",\n                \"default\": \"return body[pin] === true;\"\n            } \n        },\n        \"required\": [\"gpioList\", \n                     \"requestTimeout\",\n                     \"switchPanelBackgroundColor\",\n                     \"gpioStatusRequest\",\n                     \"gpioStatusChangeRequest\",\n                     \"parseGpioStatusFunction\"]\n    },\n    \"form\": [\n        \"gpioList\",\n        \"requestTimeout\",\n        {\n            \"key\": \"switchPanelBackgroundColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gpioStatusRequest\",\n            \"items\": [\n                \"gpioStatusRequest.method\",\n                {\n                    \"key\": \"gpioStatusRequest.paramsBody\",\n                    \"type\": \"json\"\n                }\n            ]\n        },\n        {\n            \"key\": \"gpioStatusChangeRequest\",\n            \"items\": [\n                \"gpioStatusChangeRequest.method\",\n                {\n                    \"key\": \"gpioStatusChangeRequest.paramsBody\",\n                    \"type\": \"json\"\n                }\n            ]\n        },\n        {\n            \"key\": \"parseGpioStatusFunction\",\n            \"type\": \"javascript\"\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"targetDeviceAliases\":[],\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"parseGpioStatusFunction\":\"return body[pin] === true;\",\"gpioStatusChangeRequest\":{\"method\":\"setGpioStatus\",\"paramsBody\":\"{\\n   \\\"pin\\\": \\\"{$pin}\\\",\\n   \\\"enabled\\\": \\\"{$enabled}\\\"\\n}\"},\"requestTimeout\":500,\"switchPanelBackgroundColor\":\"#008a00\",\"gpioStatusRequest\":{\"method\":\"getGpioStatus\",\"paramsBody\":\"{}\"},\"gpioList\":[{\"pin\":7,\"label\":\"GPIO 4 (GPCLK0)\",\"row\":3,\"col\":0,\"_uniqueKey\":0},{\"pin\":11,\"label\":\"GPIO 17\",\"row\":5,\"col\":0,\"_uniqueKey\":1},{\"pin\":12,\"label\":\"GPIO 18\",\"row\":5,\"col\":1,\"_uniqueKey\":2},{\"_uniqueKey\":3,\"pin\":13,\"label\":\"GPIO 27\",\"row\":6,\"col\":0},{\"_uniqueKey\":4,\"pin\":15,\"label\":\"GPIO 22\",\"row\":7,\"col\":0},{\"_uniqueKey\":5,\"pin\":16,\"label\":\"GPIO 23\",\"row\":7,\"col\":1},{\"_uniqueKey\":6,\"pin\":18,\"label\":\"GPIO 24\",\"row\":8,\"col\":1},{\"_uniqueKey\":7,\"pin\":22,\"label\":\"GPIO 25\",\"row\":10,\"col\":1},{\"_uniqueKey\":8,\"pin\":29,\"label\":\"GPIO 5\",\"row\":14,\"col\":0},{\"_uniqueKey\":9,\"pin\":31,\"label\":\"GPIO 6\",\"row\":15,\"col\":0},{\"_uniqueKey\":10,\"pin\":32,\"label\":\"GPIO 12\",\"row\":15,\"col\":1},{\"_uniqueKey\":11,\"pin\":33,\"label\":\"GPIO 13\",\"row\":16,\"col\":0},{\"_uniqueKey\":12,\"pin\":35,\"label\":\"GPIO 19\",\"row\":17,\"col\":0},{\"_uniqueKey\":13,\"pin\":36,\"label\":\"GPIO 16\",\"row\":17,\"col\":1},{\"_uniqueKey\":14,\"pin\":37,\"label\":\"GPIO 26\",\"row\":18,\"col\":0},{\"_uniqueKey\":15,\"pin\":38,\"label\":\"GPIO 20\",\"row\":18,\"col\":1},{\"_uniqueKey\":16,\"pin\":40,\"label\":\"GPIO 21\",\"row\":19,\"col\":1}]},\"title\":\"Raspberry Pi GPIO Control\"}"}',
+'Raspberry Pi GPIO Control' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'lcd_bar_gauge',
+'{"type":"latest","sizeX":2,"sizeY":3.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Humidity\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#babab2\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"RobotoDraft\",\"style\":\"normal\",\"weight\":\"400\",\"size\":16},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":1.5,\"decimals\":0,\"showUnitTitle\":true,\"defaultColor\":\"#444444\",\"gaugeType\":\"verticalBar\",\"units\":\"%\"},\"title\":\"LCD bar gauge\"}"}',
+'LCD bar gauge' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'pie',
+'{"type":"latest","sizeX":8,"sizeY":6,"resources":[{"url":"https://rawgithub.com/HumbleSoftware/Flotr2/master/flotr2.min.js"}],"templateHtml":"","templateCss":"","controllerScript":"var options, graph, pieData = [];\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n    var colors = [];\n    for (var i in data) {\n        colors.push(data[i].dataKey.color);\n        var pieCell = {\n             data: [[0,0]],\n             label: data[i].dataKey.label\n        }\n        pieData.push(pieCell);\n    }\n\n    options = {\n         colors: colors,\n         HtmlText : false,\n        grid : {\n            verticalLines : false,\n            horizontalLines : false\n        },\n        xaxis : { showLabels : false },\n        yaxis : { showLabels : false },\n        pie : {\n             show : true, \n             explode : 6\n        }\n    };\n}\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n\n    for (var i in pieData) {\n         cellData = data[i];\n         if (cellData.data.length > 0) {\n             var tvPair = cellData.data[cellData.data.length -\n                1];\n             var value = tvPair[1];\n             pieData[i].data[0][1] = parseFloat(value);\n         }\n    }\n    graph = Flotr.draw(containerElement, pieData, options);\n};\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#0097a7\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#f57f17\",\"settings\":{},\"_hash\":0.6114638304362894,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#e91e63\",\"settings\":{},\"_hash\":0.9955906536344441,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#66bb6a\",\"settings\":{},\"_hash\":0.9430835931647599,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Pie - Flotr2\"}"}',
+'Pie - Flotr2' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'mini_gauge_justgage',
+'{"type":"latest","sizeX":2,"sizeY":2,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#7cb342\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"RobotoDraft\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":0,\"decimals\":0,\"roundedLineCap\":true,\"gaugeType\":\"donut\"},\"title\":\"Mini gauge - justGage\"}"}',
+'Mini gauge - justGage' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'analogue_gauges', 'radial_gauge_canvas_gauges',
+'{"type":"latest","sizeX":6,"sizeY":5,"resources":[],"templateHtml":"<canvas id=\"radialGauge\"></canvas>\n","templateCss":"","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbAnalogueRadialGauge(containerElement, settings, data, ''radialGauge'');    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged) {\n    gauge.redraw(width, height, data, sizeChanged);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },\n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"units\": {\n                \"title\": \"Units\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"majorTicksCount\": {\n                \"title\": \"Major ticks count\",\n                \"type\": \"number\",\n                \"default\": null\n            },\n            \"minorTicks\": {\n                \"title\": \"Minor ticks count\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"valueBox\": {\n                \"title\": \"Show value box\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"valueInt\": {\n                \"title\": \"Digits count for integer part of value\",\n                \"type\": \"number\",\n                \"default\": 3\n            },\n            \"valueDec\": {\n                \"title\": \"Digits count for decimal part of value\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorPlate\": {\n                \"title\": \"Plate color\",\n                \"type\": \"string\",\n                \"default\": \"#fff\"\n            },\n            \"colorMajorTicks\": {\n                \"title\": \"Major ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#444\"\n            },\n            \"colorMinorTicks\": {\n                \"title\": \"Minor ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorNeedle\": {\n                \"title\": \"Needle color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleEnd\": {\n                \"title\": \"Needle color - end gradient\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleShadowUp\": {\n                \"title\": \"Upper half of the needle shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(2,255,255,0.2)\"\n            },\n            \"colorNeedleShadowDown\": {\n                \"title\": \"Drop shadow needle color.\",\n                \"type\": \"string\",\n                \"default\": \"rgba(188,143,143,0.45)\"\n            },\n            \"colorValueBoxRect\": {\n                \"title\": \"Value box rectangle stroke color\",\n                \"type\": \"string\",\n                \"default\": \"#888\"\n            },\n            \"colorValueBoxRectEnd\": {\n                \"title\": \"Value box rectangle stroke color - end gradient\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorValueBoxBackground\": {\n                \"title\": \"Value box background color\",\n                \"type\": \"string\",\n                \"default\": \"#babab2\"\n            },\n            \"colorValueBoxShadow\": {\n                \"title\": \"Value box shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(0,0,0,1)\"\n            },\n            \"highlights\": {\n                \"title\": \"Highlights\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Highlight\",\n                  \"type\": \"object\",\n                  \"properties\": {\n                    \"from\": {\n                      \"title\": \"From\",\n                      \"type\": \"number\"\n                    },\n                    \"to\": {\n                      \"title\": \"To\",\n                      \"type\": \"number\"\n                    },\n                    \"color\": {\n                      \"title\": \"Color\",\n                      \"type\": \"string\"\n                    }\n                  }\n                }\n            },\n            \"highlightsWidth\": {\n                \"title\": \"Highlights width\",\n                \"type\": \"number\",\n                \"default\": 15\n            },\n            \"showBorder\": {\n                \"title\": \"Show border\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"numbersFont\": {\n                \"title\": \"Tick numbers font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"titleFont\": {\n                \"title\": \"Title text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 24\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"unitsFont\": {\n                \"title\": \"Units text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 22\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Value text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 40\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#444\"\n                    },\n                    \"shadowColor\": {\n                        \"title\": \"Shadow color\",\n                        \"type\": \"string\",\n                        \"default\": \"rgba(0,0,0,0.3)\"\n                    }\n                }\n            },\n            \"animation\": {\n                \"title\": \"Enable animation\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"animationDuration\": {\n                \"title\": \"Animation duration\",\n                \"type\": \"number\",\n                \"default\": 500\n            },\n            \"animationRule\": {\n                \"title\": \"Animation rule\",\n                \"type\": \"string\",\n                \"default\": \"cycle\"\n            },\n            \"startAngle\": {\n                \"title\": \"Start ticks angle\",\n                \"type\": \"number\",\n                \"default\": 45\n            },\n            \"ticksAngle\": {\n                \"title\": \"Ticks angle\",\n                \"type\": \"number\",\n                \"default\": 270\n            },\n            \"needleCircleSize\": {\n                \"title\": \"Needle circle size\",\n                \"type\": \"number\",\n                \"default\": 10\n            }\n        },\n        \"required\": []\n    },\n    \"form\": [\n        \"startAngle\",\n        \"ticksAngle\",\n        \"needleCircleSize\",\n        \"minValue\",\n        \"maxValue\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"units\",\n        \"majorTicksCount\",\n        \"minorTicks\",\n        \"valueBox\",\n        \"valueInt\",\n        \"valueDec\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorPlate\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMajorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMinorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedle\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowUp\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowDown\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRect\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRectEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxBackground\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxShadow\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"highlights\",\n            \"items\": [\n                \"highlights[].from\",\n                \"highlights[].to\",\n                {\n                    \"key\": \"highlights[].color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        \"highlightsWidth\",\n        \"showBorder\",\n        {\n            \"key\": \"numbersFont\",\n            \"items\": [\n                \"numbersFont.family\",\n                \"numbersFont.size\",\n                {\n                   \"key\": \"numbersFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"numbersFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"numbersFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"unitsFont\",\n            \"items\": [\n                \"unitsFont.family\",\n                \"unitsFont.size\",\n                {\n                   \"key\": \"unitsFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"unitsFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"unitsFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                },\n                {\n                    \"key\": \"valueFont.shadowColor\",\n                    \"type\": \"color\"\n                }\n            ]\n        },        \n        \"animation\",\n        \"animationDuration\",\n        {\n            \"key\": \"animationRule\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \"quad\",\n                    \"label\": \"Quad\"\n                },\n                {\n                    \"value\": \"quint\",\n                    \"label\": \"Quint\"\n                },\n                {\n                    \"value\": \"cycle\",\n                    \"label\": \"Cycle\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                },\n                {\n                    \"value\": \"elastic\",\n                    \"label\": \"Elastic\"\n                },\n                {\n                    \"value\": \"dequad\",\n                    \"label\": \"Dequad\"\n                },\n                {\n                    \"value\": \"dequint\",\n                    \"label\": \"Dequint\"\n                },\n                {\n                    \"value\": \"decycle\",\n                    \"label\": \"Decycle\"\n                },\n                {\n                    \"value\": \"debounce\",\n                    \"label\": \"Debounce\"\n                },\n                {\n                    \"value\": \"delastic\",\n                    \"label\": \"Delastic\"\n                }\n            ]\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 50 - 25;\\nif (value < -100) {\\n\\tvalue = -100;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":100,\"startAngle\":45,\"ticksAngle\":270,\"showBorder\":true,\"defaultColor\":\"#e65100\",\"needleCircleSize\":10,\"highlights\":[],\"showUnitTitle\":true,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":10,\"valueInt\":3,\"valueDec\":0,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":500,\"animationRule\":\"cycle\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"numbersFont\":{\"family\":\"RobotoDraft\",\"size\":18,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":24,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#888\"},\"unitsFont\":{\"family\":\"RobotoDraft\",\"size\":22,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"size\":36,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\"},\"minValue\":-100,\"colorNeedleShadowDown\":\"rgba(188,143,143,0.45)\",\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\"},\"title\":\"Radial gauge - Canvas Gauges\"}"}',
+'Radial gauge - Canvas Gauges' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'maps', 'google_maps',
+'{"type":"latest","sizeX":8.5,"sizeY":6,"resources":[],"templateHtml":"","templateCss":".error {\n    color: red;\n}\n.tb-labels {\n  color: #222;\n  font: 12px/1.5 \"Helvetica Neue\", Arial, Helvetica, sans-serif;\n  text-align: center;\n  width: 100px;\n  white-space: nowrap;\n}","controllerScript":"var map;\nvar positions;\nvar markers = [];\nvar markersSettings = [];\nvar defaultZoomLevel;\nvar dontFitMapBounds;\n\nvar markerCluster;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    \n    if (settings.defaultZoomLevel) {\n        if (settings.defaultZoomLevel > 0 && settings.defaultZoomLevel < 21) {\n            defaultZoomLevel = Math.floor(settings.defaultZoomLevel);\n        }\n    }\n    \n    dontFitMapBounds = settings.fitMapBounds === false;\n    \n    var configuredMarkersSettings = settings.markersSettings;\n    if (!configuredMarkersSettings) {\n        configuredMarkersSettings = [];\n    }\n    \n    for (var i=0;i<datasources.length;i++) {\n        markersSettings[i] = {\n            latKeyName: \"lat\",\n            lngKeyName: \"lng\",\n            showLabel: true,\n            label: datasources[i].name,\n            color: \"FE7569\"\n        };\n        if (configuredMarkersSettings[i]) {\n            markersSettings[i].latKeyName = configuredMarkersSettings[i].latKeyName || markersSettings[i].latKeyName;\n            markersSettings[i].lngKeyName = configuredMarkersSettings[i].lngKeyName || markersSettings[i].lngKeyName;\n            markersSettings[i].showLabel = configuredMarkersSettings[i].showLabel !== false;\n            markersSettings[i].label = configuredMarkersSettings[i].label || markersSettings[i].label;\n            markersSettings[i].color = configuredMarkersSettings[i].color ? tinycolor(configuredMarkersSettings[i].color).toHex() : markersSettings[i].color;\n        }\n    }\n\n    var mapId = '''' + Math.random().toString(36).substr(2, 9);\n    \n    function clearGlobalId() {\n        if ($window.loadingGmId && $window.loadingGmId === mapId) {\n            $window.loadingGmId = null;\n        }\n    }\n    \n    $window.gm_authFailure = function() {\n        if ($window.loadingGmId && $window.loadingGmId === mapId) {\n            $window.loadingGmId = null;\n            $window.gmApiKeys[apiKey].error = ''Unable to authentificate for Google Map API.</br>Please check your API key.'';\n            displayError($window.gmApiKeys[apiKey].error);\n        }\n    };\n    \n    function displayError(message) {\n        $(containerElement).html(\n            \"<div class=''error''>\"+ message + \"</div>\"\n        );\n    }\n\n    var initMapFunctionName = ''initGoogleMap_'' + mapId;\n    $window[initMapFunctionName] = function() {\n        lazyLoad.load({ type: ''js'', path: ''https://cdn.rawgit.com/googlemaps/v3-utility-library/master/markerwithlabel/src/markerwithlabel.js'' }).then(\n            function success() {\n                initMap();\n            },\n            function fail() {\n                clearGloabalId();\n                $window.gmApiKeys[apiKey].error = ''Google map api load failed!</br>''+e;\n                displayError($window.gmApiKeys[apiKey].error);\n            }\n        );\n        \n    };   \n    \n    var apiKey = settings.gmApiKey || '''';\n\n    if (apiKey && apiKey.length > 0) {\n        if (!$window.gmApiKeys) {\n            $window.gmApiKeys = {};\n        }\n        if ($window.gmApiKeys[apiKey]) {\n            if ($window.gmApiKeys[apiKey].error) {\n                displayError($window.gmApiKeys[apiKey].error);\n            } else {\n                initMap();\n            }\n        } else {\n            $window.gmApiKeys[apiKey] = {};\n            var googleMapScriptRes = ''https://maps.googleapis.com/maps/api/js?key=''+apiKey+''&callback=''+initMapFunctionName;\n        \n            $window.loadingGmId = mapId;\n            lazyLoad.load({ type: ''js'', path: googleMapScriptRes }).then(\n                function success() {\n                    setTimeout(clearGlobalId, 2000);\n                },\n                function fail(e) {\n                    clearGloabalId();\n                    $window.gmApiKeys[apiKey].error = ''Google map api load failed!</br>''+e;\n                    displayError($window.gmApiKeys[apiKey].error);\n                }\n            );\n        }\n    } else {\n        displayError(''No Google Map Api Key provided!'');\n    }\n\n    function initMap() {\n        \n        map = new google.maps.Map(containerElement, {\n          scrollwheel: false,\n          zoom: defaultZoomLevel || 8\n        });\n\n    };\n\n}\n\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n    \n    function createMarker(location, settings) {\n        var pinColor = settings.color;\n        var pinImage = new google.maps.MarkerImage(\"http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|\" + pinColor,\n            new google.maps.Size(21, 34),\n            new google.maps.Point(0,0),\n            new google.maps.Point(10, 34));\n        var pinShadow = new google.maps.MarkerImage(\"http://chart.apis.google.com/chart?chst=d_map_pin_shadow\",\n            new google.maps.Size(40, 37),\n            new google.maps.Point(0, 0),\n            new google.maps.Point(12, 35));        \n        var marker;\n        if (settings.showLabel) {    \n                marker = new MarkerWithLabel({\n                    position: location, \n                    map: map,\n                    icon: pinImage,\n                    shadow: pinShadow,\n                    labelContent: ''<b>''+settings.label+''</b>'',\n                    labelClass: \"tb-labels\",\n                    labelAnchor: new google.maps.Point(50, 55)\n                });            \n        } else {\n                marker = new google.maps.Marker({\n                    position: location, \n                    map: map,\n                    icon: pinImage,\n                    shadow: pinShadow\n                });            \n        }\n            \n        return marker;    \n    }\n    \n    function updatePosition(position, data) {\n        if (position.latIndex > -1 && position.lngIndex > -1) {\n            var latData = data[position.latIndex].data;\n            var lngData = data[position.lngIndex].data;\n            if (latData.length > 0 && lngData.length > 0) {\n                var lat = latData[latData.length-1][1];\n                var lng = lngData[lngData.length-1][1];\n                var location = new google.maps.LatLng(lat, lng);\n                if (!position.marker) {\n                    position.marker = createMarker(location, position.settings);\n                    markers.push(position.marker);\n                    return true;\n                } else {\n                    var prevPosition = position.marker.getPosition();\n                    if (!prevPosition.equals(location)) {\n                        position.marker.setPosition(location);\n                        return true;\n                    }\n                }\n            }\n        }\n        return false;\n    }\n        \n    function loadPositions(data) {\n        var bounds = new google.maps.LatLngBounds();\n        positions = [];\n        var datasourceIndex = -1;\n        var markerSettings;\n        var datasource;\n        for (var i = 0; i < data.length; i++) {\n            var datasourceData = data[i];\n            if (!datasource || datasource != datasourceData.datasource) {\n                datasourceIndex++;\n                datasource = datasourceData.datasource;\n                markerSettings = markersSettings[datasourceIndex];\n            }\n            var dataKey = datasourceData.dataKey;\n            if (dataKey.label === markerSettings.latKeyName ||\n                dataKey.label === markerSettings.lngKeyName) {\n                var position = positions[datasourceIndex];\n                if (!position) {\n                    position = {\n                        latIndex: -1,\n                        lngIndex: -1,\n                        settings: markerSettings\n                    };\n                    positions[datasourceIndex] = position;\n                } else if (position.marker) {\n                    continue;\n                }\n                if (dataKey.label === markerSettings.latKeyName) {\n                    position.latIndex = i;\n                } else {\n                    position.lngIndex = i;\n                }\n                if (position.latIndex > -1 && position.lngIndex > -1) {\n                    updatePosition(position, data);\n                    if (position.marker) {\n                        bounds.extend(position.marker.getPosition());\n                    }\n                }\n            }\n        }\n        fitMapBounds(bounds);\n    }\n    \n    function updatePositions(data) {\n        var positionsChanged = false;\n        var bounds = new google.maps.LatLngBounds();\n        for (var p in positions) {\n            var position = positions[p];\n            positionsChanged |= updatePosition(position, data);\n            if (position.marker) {\n                bounds.extend(position.marker.getPosition());\n            }\n        }\n        if (!dontFitMapBounds && positionsChanged) {\n            fitMapBounds(bounds);\n        }\n    }\n    \n    function fitMapBounds(bounds) {\n        google.maps.event.addListenerOnce(map, ''bounds_changed'', function(event) {\n            var zoomLevel = defaultZoomLevel || map.getZoom();\n            this.setZoom(zoomLevel);\n            if (!defaultZoomLevel && this.getZoom() > 15) {\n                this.setZoom(15);\n            }\n        });\n        map.fitBounds(bounds);\n    }\n\n    if (map) {\n        if (data) {\n            if (!positions) {\n                loadPositions(data);\n            } else {\n                updatePositions(data);\n            }\n        }\n        if (sizeChanged) {\n            google.maps.event.trigger(map, \"resize\");\n            var bounds = new google.maps.LatLngBounds();\n            for (var m in markers) {\n                bounds.extend(markers[m].getPosition());\n            }\n            fitMapBounds(bounds);\n        }\n    }\n\n};","settingsSchema":"{\n  \"schema\": {\n    \"title\": \"Google Map Configuration\",\n    \"type\": \"object\",\n    \"properties\": {\n      \"gmApiKey\": {\n        \"title\": \"Google Maps API Key\",\n        \"type\": \"string\"\n      },\n      \"defaultZoomLevel\": {\n         \"title\": \"Default map zoom level (1 - 20)\",\n         \"type\": \"number\"\n      },\n      \"fitMapBounds\": {\n          \"title\": \"Fit map bounds to cover all markers\",\n          \"type\": \"boolean\",\n          \"default\": true\n      },\n      \"markersSettings\": {\n            \"title\": \"Markers settings, same order as datasources\",\n            \"type\": \"array\",\n            \"items\": {\n              \"title\": \"Marker settings\",\n              \"type\": \"object\",\n              \"properties\": {\n                  \"latKeyName\": {\n                    \"title\": \"Latitude key name\",\n                    \"type\": \"string\",\n                    \"default\": \"lat\"\n                  },\n                  \"lngKeyName\": {\n                    \"title\": \"Longitude key name\",\n                    \"type\": \"string\",\n                    \"default\": \"lng\"\n                  },                  \n                  \"showLabel\": {\n                    \"title\": \"Show label\",\n                    \"type\": \"boolean\",\n                    \"default\": true\n                  },                  \n                  \"label\": {\n                    \"title\": \"Label\",\n                    \"type\": \"string\"\n                  },\n                  \"color\": {\n                    \"title\": \"Color\",\n                    \"type\": \"string\"\n                  }\n              }\n            }\n      }\n    },\n    \"required\": [\n      \"gmApiKey\"\n    ]\n  },\n  \"form\": [\n    \"gmApiKey\",\n    \"defaultZoomLevel\",\n    \"fitMapBounds\",\n    {\n        \"key\": \"markersSettings\",\n        \"items\": [\n            \"markersSettings[].latKeyName\",\n            \"markersSettings[].lngKeyName\",\n            \"markersSettings[].showLabel\",\n            \"markersSettings[].label\",\n            {\n                \"key\": \"markersSettings[].color\",\n                \"type\": \"color\"\n            }\n        ]\n    }\n  ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.05427416942713381,\"funcBody\":\"var value = prevValue || 15.833293;\\nif (time % 5000 < 500) {\\n    value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.680594833308841,\"funcBody\":\"var value = prevValue || -90.454350;\\nif (time % 5000 < 500) {\\n    value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lat\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.05012157428742059,\"funcBody\":\"var value = prevValue || 14.450463;\\nif (time % 4000 < 500) {\\n    value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lng\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.6742359401617628,\"funcBody\":\"var value = prevValue || -84.845334;\\nif (time % 4000 < 500) {\\n    value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"gmApiKey\":\"AIzaSyDoEx2kaGz3PxwbI9T7ccTSg5xjdw8Nw8Q\",\"markersSettings\":[{\"label\":\"First point\",\"color\":\"#1e88e5\",\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true},{\"label\":\"Second point\",\"color\":\"#fdd835\",\"latKeyName\":\"lat\",\"lngKeyName\":\"lng\",\"showLabel\":true}],\"fitMapBounds\":true},\"title\":\"Google Maps\"}"}',
+'Google Maps' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'basic_timeseries',
+'{"type":"timeseries","sizeX":8,"sizeY":6,"resources":[{"url":"https://rawgithub.com/HumbleSoftware/Flotr2/master/flotr2.min.js"}],"templateHtml":"","templateCss":"","controllerScript":"var graph, options;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n    var colors = [];\n    for (var i in data) {\n        data[i].label = data[i].dataKey.label;\n        colors.push(data[i].dataKey.color);\n        var keySettings = data[i].dataKey.settings;\n\n        data[i].lines = {\n            fill: keySettings.fillLines || false,\n            show: keySettings.showLines || true\n        };\n\n        data[i].points = {\n            show: keySettings.showPoints || false\n        };\n    }\n    options = {\n        colors: colors,\n        title: null,\n        subtitle: null,\n        shadowSize: settings.shadowSize || 4,\n        fontColor: settings.fontColor || \"#545454\",\n        fontSize: settings.fontSize || 7.5,\n        xaxis: {\n            mode: ''time'',\n            timeMode: ''local''\n        },\n        yaxis: {\n        },\n        HtmlText: false,\n        grid: {\n            verticalLines: true,\n            horizontalLines: true\n        }\n    };\n    if (settings.grid) {\n        options.grid.color = settings.grid.color || \"#545454\";\n        options.grid.backgroundColor = settings.grid.backgroundColor || null;\n        options.grid.tickColor = settings.grid.tickColor || \"#DDDDDD\";\n        options.grid.verticalLines = settings.grid.verticalLines !== false;\n        options.grid.horizontalLines = settings.grid.horizontalLines !== false;\n    }\n    if (settings.xaxis) {\n        options.xaxis.showLabels = settings.xaxis.showLabels !== false;\n        options.xaxis.color = settings.xaxis.color || null;\n        options.xaxis.title = settings.xaxis.title || null;\n        options.xaxis.titleAngle = settings.xaxis.titleAngle || 0;\n    }\n    if (settings.yaxis) {\n        options.yaxis.showLabels = settings.yaxis.showLabels !== false;\n        options.yaxis.color = settings.yaxis.color || null;\n        options.yaxis.title = settings.yaxis.title || null;\n        options.yaxis.titleAngle = settings.yaxis.titleAngle || 0;\n    }\n}\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n    options.xaxis.min = timeWindow.minTime;\n    options.xaxis.max = timeWindow.maxTime;\n    graph = Flotr.draw(containerElement, data, options);\n};\n\nfns.destroy = function() {\n    //console.log(''destroy!'');\n};","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"shadowSize\": {\n                \"title\": \"Shadow size\",\n                \"type\": \"number\",\n                \"default\": 4\n            },\n            \"fontColor\": {\n                \"title\": \"Font color\",\n                \"type\": \"string\",\n                \"default\": \"#545454\"\n            },\n            \"fontSize\": {\n                \"title\": \"Font size\",\n                \"type\": \"number\",\n                \"default\": 7.5\n            },\n            \"grid\": {\n                \"title\": \"Grid settings\",\n                \"type\": \"object\",\n                \"properties\": {\n                    \"color\": {\n                        \"title\": \"Primary color\",\n                        \"type\": \"string\",\n                        \"default\": \"#545454\"\n                    },\n                    \"backgroundColor\": {\n                        \"title\": \"Background color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    },\n                    \"tickColor\": {\n                        \"title\": \"Ticks color\",\n                        \"type\": \"string\",\n                        \"default\": \"#DDDDDD\"\n                    },\n                    \"verticalLines\": {\n                        \"title\": \"Show vertical lines\",\n                        \"type\": \"boolean\",\n                        \"default\": true\n                    },\n                    \"horizontalLines\": {\n                        \"title\": \"Show horizontal lines\",\n                        \"type\": \"boolean\",\n                        \"default\": true\n                    }\n                }\n            },\n            \"xaxis\": {\n                \"title\": \"X axis settings\",\n                \"type\": \"object\",\n                \"properties\": {\n                    \"showLabels\": {\n                        \"title\": \"Show labels\",\n                        \"type\": \"boolean\",\n                        \"default\": true\n                    },\n                    \"title\": {\n                        \"title\": \"Axis title\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    },\n                    \"titleAngle\": {\n                        \"title\": \"Axis title''s angle in degrees\",\n                        \"type\": \"number\",\n                        \"default\": 0\n                    },\n                    \"color\": {\n                        \"title\": \"Ticks color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"yaxis\": {\n                \"title\": \"Y axis settings\",\n                \"type\": \"object\",\n                \"properties\": {\n                    \"showLabels\": {\n                        \"title\": \"Show labels\",\n                        \"type\": \"boolean\",\n                        \"default\": true\n                    },\n                    \"title\": {\n                        \"title\": \"Axis title\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    },\n                    \"titleAngle\": {\n                        \"title\": \"Axis title''s angle in degrees\",\n                        \"type\": \"number\",\n                        \"default\": 0\n                    },\n                    \"color\": {\n                        \"title\": \"Ticks color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        },\n        \"required\": []\n    },\n    \"form\": [\n        \"shadowSize\", \n        {\n            \"key\": \"fontColor\",\n            \"type\": \"color\"\n        },\n        \"fontSize\", \n        {\n            \"key\": \"grid\",\n            \"items\": [\n                {\n                    \"key\": \"grid.color\",\n                    \"type\": \"color\"\n                },\n                {\n                    \"key\": \"grid.backgroundColor\",\n                    \"type\": \"color\"\n                },\n                {\n                    \"key\": \"grid.tickColor\",\n                    \"type\": \"color\"\n                },\n                \"grid.verticalLines\",\n                \"grid.horizontalLines\"\n            ]\n        },\n        {\n            \"key\": \"xaxis\",\n            \"items\": [\n                \"xaxis.showLabels\",\n                \"xaxis.title\",\n                \"xaxis.titleAngle\",\n                {\n                    \"key\": \"xaxis.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"yaxis\",\n            \"items\": [\n                \"yaxis.showLabels\",\n                \"yaxis.title\",\n                \"yaxis.titleAngle\",\n                {\n                    \"key\": \"yaxis.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n\n    ]\n}","dataKeySettingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"DataKeySettings\",\n        \"properties\": {\n            \"showLines\": {\n                \"title\": \"Show lines\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"fillLines\": {\n                \"title\": \"Fill lines\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },\n            \"showPoints\": {\n                \"title\": \"Show points\",\n                \"type\": \"boolean\",\n                \"default\": false\n            }\n        },\n        \"required\": [\"showLines\", \"fillLines\", \"showPoints\"]\n    },\n    \"form\": [\n        \"showLines\",\n        \"fillLines\",\n        \"showPoints\"\n    ]\n}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.8587686344902596,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.12775350966079668,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"shadowSize\":4,\"fontColor\":\"#545454\",\"fontSize\":7.5,\"xaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"yaxis\":{\"showLabels\":true,\"color\":\"#545454\"},\"grid\":{\"color\":\"#545454\",\"tickColor\":\"#DDDDDD\",\"verticalLines\":true,\"horizontalLines\":true,\"backgroundColor\":\"#ffffff\"}},\"title\":\"Timeseries - Flotr2\"}"}',
+'Timeseries - Flotr2' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'horizontal_bar_justgage',
+'{"type":"latest","sizeX":7,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"RobotoDraft\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":0,\"gaugeColor\":\"#eeeeee\",\"showTitle\":true,\"gaugeType\":\"horizontalBar\"},\"title\":\"Horizontal bar - justGage\"}"}',
+'Horizontal bar - justGage' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'lcd_gauge',
+'{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 180) {\\n\\tvalue = 180;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#babab2\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"defaultColor\":\"#444444\",\"gaugeType\":\"arc\"},\"title\":\"LCD gauge\"}"}',
+'LCD gauge' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'digital_bar',
+'{"type":"latest","sizeX":6,"sizeY":2.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 80) {\\n\\tvalue = 80;\\n} else if (value > 160) {\\n\\tvalue = 160;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#008000\",\"#fbc02d\",\"#f44336\"],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#ffffff\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"horizontalBar\",\"showTitle\":false},\"title\":\"Digital horizontal bar\"}"}',
+'Digital horizontal bar' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'simple_gauge_justgage',
+'{"type":"latest","sizeX":2,"sizeY":2,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#ef6c00\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"RobotoDraft\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":0,\"dashThickness\":0,\"decimals\":0,\"gaugeColor\":\"#eeeeee\",\"gaugeType\":\"donut\"},\"title\":\"Simple gauge - justGage\"}"}',
+'Simple gauge - justGage' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'radar_chart_js',
+'{"type":"latest","sizeX":7,"sizeY":6,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"<canvas id=\"radarChart\"></canvas>\n","templateCss":"","controllerScript":"var chart;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n    var barData = {\n        labels: [],\n        datasets: []\n    };\n\n    var backgroundColor = tinycolor(data[0].dataKey.color);\n    backgroundColor.setAlpha(0.2);\n    var borderColor = tinycolor(data[0].dataKey.color);\n    borderColor.setAlpha(1);\n    var dataset = {\n        label: datasources[0].name,\n        data: [],\n        backgroundColor: backgroundColor.toRgbString(),\n        borderColor: borderColor.toRgbString(),\n        pointBackgroundColor: borderColor.toRgbString(),\n        pointBorderColor: borderColor.darken().toRgbString(),\n        borderWidth: 1\n    }\n    \n    barData.datasets.push(dataset);\n    \n    for (var i in data) {\n        var dataKey = data[i].dataKey;\n        barData.labels.push(dataKey.label);\n        dataset.data.push(0);\n    }\n\n    var ctx = $(''#radarChart'', containerElement);\n    chart = new Chart(ctx, {\n        type: ''radar'',\n        data: barData,\n        options: {\n            maintainAspectRatio: false\n        }\n    });\n    \n}\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n\n    for (var i = 0; i < data.length; i++) {\n        var cellData = data[i];\n        if (cellData.data.length > 0) {\n             var tvPair = cellData.data[cellData.data.length - 1];\n             var value = tvPair[1];\n             chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }\n  \n    chart.update();\n    if (sizeChanged) {\n        chart.resize();\n    }\n    \n};\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Radar - Chart.js\"}"}',
+'Radar - Chart.js' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'digital_speedometer',
+'{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Speed\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < 45) {\\n\\tvalue = 45;\\n} else if (value > 130) {\\n\\tvalue = 130;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":180,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#008000\",\"#fbc02d\",\"#f44336\"],\"refreshAnimationType\":\"linear\",\"refreshAnimationTime\":700,\"startAnimationType\":\"linear\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#ffffff\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"unitTitle\":\"MPH\",\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"arc\"},\"title\":\"Digital speedometer\"}"}',
+'Digital speedometer' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'timeseries',
+'{"type":"timeseries","sizeX":8,"sizeY":6,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"<canvas id=\"lineChart\"></canvas>\n","templateCss":"","controllerScript":"var chart;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n      var lineData = {\n        labels: [],\n        datasets: []\n    };\n    \n    for (var i in data) {\n        var dataKey = data[i].dataKey;\n        var keySettings = dataKey.settings;\n        var backgroundColor = tinycolor(dataKey.color);\n        backgroundColor.setAlpha(0.4);\n        var dataset = {\n            label: dataKey.label,\n            data: [],\n            borderColor: dataKey.color,\n            borderWidth: 2,\n            backgroundColor: backgroundColor.toRgbString(),\n            pointRadius: keySettings.showPoints ? 1 : 0,\n            fill: keySettings.fillLines || false,\n            showLine: keySettings.showLines || true,\n            spanGaps: false\n        }\n        lineData.datasets.push(dataset);\n    }\n\n    var ctx = $(''#lineChart'', containerElement);\n    chart = new Chart(ctx, {\n        type: ''line'',\n        data: lineData,\n        options: {\n            maintainAspectRatio: false,\n            /*animation: {\n              duration: 200,\n              easing: ''linear''\n            },*/\n            elements: {\n              line: {\n                  tension: 0.2\n              }  \n            },\n            scales: {\n                xAxes: [{\n                    type: ''time'',\n                    ticks: {\n                        maxRotation: 20,\n                        autoSkip: true\n                    },\n                    time: {\n                        displayFormats: {\n                            second: ''hh:mm:ss'',\n                            minute: ''hh:mm:ss''\n                        }\n                    }\n                }]\n            }\n        }\n    });\n\n}\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n\n    for (var i = 0; i < data.length; i++) {\n        var dataSetData = [];\n        var dataKeyData = data[i].data;\n        for (var i2 = 0; i2 < dataKeyData.length; i2 ++) {\n            dataSetData.push({x: moment(dataKeyData[i2][0]), y: dataKeyData[i2][1]});\n            \n        }\n        chart.data.datasets[i].data = dataSetData; \n    }\n\n    chart.options.scales.xAxes[0].time.min = moment(timeWindow.minTime);\n    chart.options.scales.xAxes[0].time.max = moment(timeWindow.maxTime);\n\n    if (sizeChanged) {\n        chart.resize();\n    }\n    \n    chart.update(0, true);\n\n};\n\nfns.destroy = function() {\n};","settingsSchema":"{}","dataKeySettingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"DataKeySettings\",\n        \"properties\": {\n            \"showLines\": {\n                \"title\": \"Show lines\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"fillLines\": {\n                \"title\": \"Fill lines\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },\n            \"showPoints\": {\n                \"title\": \"Show points\",\n                \"type\": \"boolean\",\n                \"default\": false\n            }\n        },\n        \"required\": [\"showLines\", \"fillLines\", \"showPoints\"]\n    },\n    \"form\": [\n        \"showLines\",\n        \"fillLines\",\n        \"showPoints\"\n    ]\n}","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{\"showLines\":true,\"fillLines\":false,\"showPoints\":false},\"_hash\":0.5644745944820795,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#ffc107\",\"settings\":{\"showLines\":true,\"fillLines\":true,\"showPoints\":false},\"_hash\":0.18379294198604845,\"funcBody\":\"var value = prevValue + Math.random() * 100 - 50;\\nvar multiplier = Math.pow(10, 2 || 0);\\nvar value = Math.round(value * multiplier) / multiplier;\\nif (value < -1000) {\\n\\tvalue = -1000;\\n} else if (value > 1000) {\\n\\tvalue = 1000;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Timeseries - Chart.js\"}"}',
+'Timeseries - Chart.js' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'bars',
+'{"type":"latest","sizeX":7,"sizeY":6,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"<canvas id=\"barChart\"></canvas>\n","templateCss":"","controllerScript":"var chart;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n        \n    var barData = {\n        labels: [],\n        datasets: []\n    };\n    \n    for (var i in datasources) {\n        var datasource = datasources[i];\n        for (i in datasource.dataKeys) {\n            var dataset = {\n                label: datasource.dataKeys[i].label,\n                data: [0],\n                backgroundColor: [datasource.dataKeys[i].color],\n                borderColor: [datasource.dataKeys[i].color],\n                borderWidth: 1\n            }\n            barData.datasets.push(dataset);\n        }\n    }\n\n    var ctx = $(''#barChart'', containerElement);\n    chart = new Chart(ctx, {\n        type: ''bar'',\n        data: barData,\n        options: {\n            maintainAspectRatio: false,\n            scales: {\n                yAxes: [{\n                    ticks: {\n                        beginAtZero:true\n                    }\n                }]\n            }\n        }\n    });\n    \n}\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n    var c = 0;\n    for (var i = 0; i < chart.data.datasets.length; i++) {\n        var dataset = chart.data.datasets[i];\n        var cellData = data[i]; \n        if (cellData.data.length > 0) {\n             var tvPair = cellData.data[cellData.data.length - 1];\n             var value = tvPair[1];\n             dataset.data[0] = parseFloat(value);\n        }\n    }\n    chart.update();\n    if (sizeChanged) {\n        chart.resize();\n    }\n    \n};\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Bars - Chart.js\"}"}',
+'Bars - Chart.js' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'polar_area_chart_js',
+'{"type":"latest","sizeX":7,"sizeY":6,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"<canvas id=\"pieChart\"></canvas>\n","templateCss":"","controllerScript":"var chart;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n    var pieData = {\n        labels: [],\n        datasets: []\n    };\n\n    var dataset = {\n        data: [],\n        backgroundColor: [],\n        borderColor: [],\n        borderWidth: [],\n        hoverBackgroundColor: []\n    }\n    \n    pieData.datasets.push(dataset);\n    \n    for (var i in data) {\n        var dataKey = data[i].dataKey;\n        pieData.labels.push(dataKey.label);\n        dataset.data.push(0);\n        var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n        var borderColor = tinycolor(dataKey.color).darken();\n        dataset.backgroundColor.push(dataKey.color);\n        dataset.borderColor.push(''#fff'');\n        dataset.borderWidth.push(5);\n        dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n    }\n\n    var ctx = $(''#pieChart'', containerElement);\n    chart = new Chart(ctx, {\n        type: ''polarArea'',\n        data: pieData,\n        options: {\n            maintainAspectRatio: false\n        }\n    });\n    \n}\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n\n    for (var i = 0; i < data.length; i++) {\n        var cellData = data[i];\n        if (cellData.data.length > 0) {\n             var tvPair = cellData.data[cellData.data.length - 1];\n             var value = tvPair[1];\n             chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }\n  \n    chart.update();\n    if (sizeChanged) {\n        chart.resize();\n    }\n    \n};\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fifth\",\"color\":\"#607d8b\",\"settings\":{},\"_hash\":0.2074391823443591,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Polar Area - Chart.js\"}"}',
+'Polar Area - Chart.js' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'neon_gauge_justgage',
+'{"type":"latest","sizeX":5,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":70,\"dashThickness\":1,\"decimals\":1,\"gaugeType\":\"arc\"},\"title\":\"Neon gauge - justGage\"}"}',
+'Neon gauge - justGage' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'doughnut_chart_js',
+'{"type":"latest","sizeX":7,"sizeY":6,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"<canvas id=\"pieChart\"></canvas>\n","templateCss":"","controllerScript":"var chart;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n    var pieData = {\n        labels: [],\n        datasets: []\n    };\n\n    var dataset = {\n        data: [],\n        backgroundColor: [],\n        borderColor: [],\n        borderWidth: [],\n        hoverBackgroundColor: []\n    }\n    \n    pieData.datasets.push(dataset);\n    \n    for (var i in data) {\n        var dataKey = data[i].dataKey;\n        pieData.labels.push(dataKey.label);\n        dataset.data.push(0);\n        var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n        var borderColor = tinycolor(dataKey.color).darken();\n        dataset.backgroundColor.push(dataKey.color);\n        dataset.borderColor.push(''#fff'');\n        dataset.borderWidth.push(5);\n        dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n    }\n\n    var ctx = $(''#pieChart'', containerElement);\n    chart = new Chart(ctx, {\n        type: ''doughnut'',\n        data: pieData,\n        options: {\n            maintainAspectRatio: false\n        }\n    });\n    \n}\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n\n    for (var i = 0; i < data.length; i++) {\n        var cellData = data[i];\n        if (cellData.data.length > 0) {\n             var tvPair = cellData.data[cellData.data.length - 1];\n             var value = tvPair[1];\n             chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }\n  \n    chart.update();\n    if (sizeChanged) {\n        chart.resize();\n    }\n    \n};\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#26a69a\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#f57c00\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#afb42b\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#673ab7\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Doughnut - Chart.js\"}"}',
+'Doughnut - Chart.js' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'digital_vertical_bar',
+'{"type":"latest","sizeX":2.5,"sizeY":4.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":60,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[\"#3d5afe\",\"#f44336\"],\"refreshAnimationType\":\"<>\",\"refreshAnimationTime\":700,\"startAnimationType\":\"<>\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":14},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":8,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#cccccc\"},\"neonGlowBrightness\":20,\"decimals\":0,\"showUnitTitle\":true,\"gaugeColor\":\"#171a1c\",\"gaugeType\":\"verticalBar\",\"showTitle\":false,\"units\":\"°C\",\"minValue\":-60,\"dashThickness\":1.2},\"title\":\"Digital vertical bar\"}"}',
+'Digital vertical bar' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'maps', 'openstreetmap',
+'{"type":"latest","sizeX":8.5,"sizeY":6,"resources":[{"url":"https://unpkg.com/leaflet@1.0.1/dist/leaflet.css"},{"url":"https://unpkg.com/leaflet@1.0.1/dist/leaflet.js"}],"templateHtml":"","templateCss":".tb-marker-label {\n    border: none;\n    background: none;\n    box-shadow: none;\n}\n\n.tb-marker-label:before {\n    border: none;\n    background: none;\n}\n","controllerScript":"var map;\nvar positions;\nvar markers = [];\nvar markersSettings = [];\nvar defaultZoomLevel;\nvar dontFitMapBounds;\n\nvar markerCluster;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    \n    if (settings.defaultZoomLevel) {\n        if (settings.defaultZoomLevel > 0 && settings.defaultZoomLevel < 21) {\n            defaultZoomLevel = Math.floor(settings.defaultZoomLevel);\n        }\n    }\n    \n    dontFitMapBounds = settings.fitMapBounds === false;\n    \n    var configuredMarkersSettings = settings.markersSettings;\n    if (!configuredMarkersSettings) {\n        configuredMarkersSettings = [];\n    }\n    \n    for (var i=0;i<datasources.length;i++) {\n        markersSettings[i] = {\n            latKeyName: \"lat\",\n            lngKeyName: \"lng\",\n            showLabel: true,\n            label: datasources[i].name,\n            color: \"FE7569\"\n        };\n        if (configuredMarkersSettings[i]) {\n            markersSettings[i].latKeyName = configuredMarkersSettings[i].latKeyName || markersSettings[i].latKeyName;\n            markersSettings[i].lngKeyName = configuredMarkersSettings[i].lngKeyName || markersSettings[i].lngKeyName;\n            markersSettings[i].showLabel = configuredMarkersSettings[i].showLabel !== false;\n            markersSettings[i].label = configuredMarkersSettings[i].label || markersSettings[i].label;\n            markersSettings[i].color = configuredMarkersSettings[i].color ? tinycolor(configuredMarkersSettings[i].color).toHex() : markersSettings[i].color;\n        }\n    }\n    \n    map = L.map(containerElement).setView([0, 0], defaultZoomLevel || 8);\n\n    L.tileLayer(''http://{s}.tile.osm.org/{z}/{x}/{y}.png'', {\n        attribution: ''&copy; <a href=\"http://osm.org/copyright\">OpenStreetMap</a> contributors''\n    }).addTo(map);\n\n\n}\n\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n    \n    function createMarker(location, settings) {\n        var pinColor = settings.color;\n\n        var icon = L.icon({\n            iconUrl: ''http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|'' + pinColor,\n            iconSize: [21, 34],\n            iconAnchor: [10, 34],\n            popupAnchor: [0, -34],\n            shadowUrl: ''http://chart.apis.google.com/chart?chst=d_map_pin_shadow'',\n            shadowSize: [40, 37],\n            shadowAnchor: [12, 35]\n        });\n        \n        var marker = L.marker(location, {icon: icon}).addTo(map);\n        marker.bindPopup(''<b>'' + settings.label + ''</b>'');\n        if (settings.showLabel) {\n            marker.bindTooltip(''<b>'' + settings.label + ''</b>'', { className: ''tb-marker-label'', permanent: true, direction: ''top'', offset: [0, -24] });\n        }\n        return marker;\n    }\n    \n    function updatePosition(position, data) {\n        if (position.latIndex > -1 && position.lngIndex > -1) {\n            var latData = data[position.latIndex].data;\n            var lngData = data[position.lngIndex].data;\n            if (latData.length > 0 && lngData.length > 0) {\n                var lat = latData[latData.length-1][1];\n                var lng = lngData[lngData.length-1][1];\n                var location = L.latLng(lat, lng);\n                if (!position.marker) {\n                    position.marker = createMarker(location, position.settings);\n                    markers.push(position.marker);\n                    return true;\n                } else {\n                    var prevPosition = position.marker.getLatLng();\n                    if (!prevPosition.equals(location)) {\n                        position.marker.setLatLng(location);\n                        return true;\n                    }\n                }\n            }\n        }\n        return false;\n    }\n    \n    function loadPositions(data) {\n        var bounds = L.latLngBounds();\n        positions = [];\n        var datasourceIndex = -1;\n        var markerSettings;\n        var datasource;\n        for (var i = 0; i < data.length; i++) {\n            var datasourceData = data[i];\n            if (!datasource || datasource != datasourceData.datasource) {\n                datasourceIndex++;\n                datasource = datasourceData.datasource;\n                markerSettings = markersSettings[datasourceIndex];\n            }\n            var dataKey = datasourceData.dataKey;\n            if (dataKey.label === markerSettings.latKeyName ||\n                dataKey.label === markerSettings.lngKeyName) {\n                var position = positions[datasourceIndex];\n                if (!position) {\n                    position = {\n                        latIndex: -1,\n                        lngIndex: -1,\n                        settings: markerSettings\n                    };\n                    positions[datasourceIndex] = position;\n                } else if (position.marker) {\n                    continue;\n                }\n                if (dataKey.label === markerSettings.latKeyName) {\n                    position.latIndex = i;\n                } else {\n                    position.lngIndex = i;\n                }\n                if (position.latIndex > -1 && position.lngIndex > -1) {\n                    updatePosition(position, data);\n                    if (position.marker) {\n                        bounds.extend(position.marker.getLatLng());\n                    }\n                }\n            }\n        }\n        fitMapBounds(bounds);\n    }\n    \n    function updatePositions(data) {\n        var positionsChanged = false;\n        var bounds = L.latLngBounds();\n        for (var p in positions) {\n            var position = positions[p];\n            positionsChanged |= updatePosition(position, data);\n            if (position.marker) {\n                bounds.extend(position.marker.getLatLng());\n            }\n        }\n        if (!dontFitMapBounds && positionsChanged) {\n            fitMapBounds(bounds);\n        }\n    }\n    \n    function fitMapBounds(bounds) {\n        map.once(''zoomend'', function(event) {\n            var zoomLevel = defaultZoomLevel || map.getZoom();\n            map.setZoom(zoomLevel, {animate: false});\n            if (!defaultZoomLevel && this.getZoom() > 15) {\n                map.setZoom(15, {animate: false});\n            }\n        });\n        map.fitBounds(bounds, {padding: [50, 50], animate: false});\n    }\n    \n    if (map) {\n        if (data) {\n            if (!positions) {\n                loadPositions(data);\n            } else {\n                updatePositions(data);\n            }\n        }\n        if (sizeChanged) {\n            map.invalidateSize(true);\n            var bounds = L.latLngBounds();\n            for (var m in markers) {\n                bounds.extend(markers[m].getLatLng());\n            }\n            fitMapBounds(bounds);\n        }\n    }\n\n};","settingsSchema":"{\n  \"schema\": {\n    \"title\": \"Google Map Configuration\",\n    \"type\": \"object\",\n    \"properties\": {\n      \"defaultZoomLevel\": {\n         \"title\": \"Default map zoom level (1 - 20)\",\n         \"type\": \"number\"\n      },\n      \"fitMapBounds\": {\n          \"title\": \"Fit map bounds to cover all markers\",\n          \"type\": \"boolean\",\n          \"default\": true\n      },\n      \"markersSettings\": {\n            \"title\": \"Markers settings, same order as datasources\",\n            \"type\": \"array\",\n            \"items\": {\n              \"title\": \"Marker settings\",\n              \"type\": \"object\",\n              \"properties\": {\n                  \"latKeyName\": {\n                    \"title\": \"Latitude key name\",\n                    \"type\": \"string\",\n                    \"default\": \"lat\"\n                  },\n                  \"lngKeyName\": {\n                    \"title\": \"Longitude key name\",\n                    \"type\": \"string\",\n                    \"default\": \"lng\"\n                  },                  \n                  \"showLabel\": {\n                    \"title\": \"Show label\",\n                    \"type\": \"boolean\",\n                    \"default\": true\n                  },                  \n                  \"label\": {\n                    \"title\": \"Label\",\n                    \"type\": \"string\"\n                  },\n                  \"color\": {\n                    \"title\": \"Color\",\n                    \"type\": \"string\"\n                  }\n              }\n            }\n      }\n    },\n    \"required\": [\n    ]\n  },\n  \"form\": [\n    \"defaultZoomLevel\",\n    \"fitMapBounds\",\n    {\n        \"key\": \"markersSettings\",\n        \"items\": [\n            \"markersSettings[].latKeyName\",\n            \"markersSettings[].lngKeyName\",\n            \"markersSettings[].showLabel\",\n            \"markersSettings[].label\",\n            {\n                \"key\": \"markersSettings[].color\",\n                \"type\": \"color\"\n            }\n        ]\n    }\n  ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"latitude\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.05427416942713381,\"funcBody\":\"var value = prevValue || 15.833293;\\nif (time % 5000 < 500) {\\n    value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"longitude\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.680594833308841,\"funcBody\":\"var value = prevValue || -90.454350;\\nif (time % 5000 < 500) {\\n    value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]},{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lat\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.05012157428742059,\"funcBody\":\"var value = prevValue || 14.450463;\\nif (time % 4000 < 500) {\\n    value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"lng\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.6742359401617628,\"funcBody\":\"var value = prevValue || -84.845334;\\nif (time % 4000 < 500) {\\n    value += Math.random() * 0.05 - 0.025;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"markersSettings\":[{\"label\":\"First point\",\"color\":\"#1e88e5\",\"latKeyName\":\"latitude\",\"lngKeyName\":\"longitude\",\"showLabel\":true},{\"label\":\"Second point\",\"color\":\"#fdd835\",\"latKeyName\":\"lat\",\"lngKeyName\":\"lng\",\"showLabel\":true}],\"fitMapBounds\":true},\"title\":\"OpenStreetMap\"}"}',
+'OpenStreetMap' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'analogue_gauges', 'temperature_radial_gauge_canvas_gauges',
+'{"type":"latest","sizeX":6,"sizeY":5,"resources":[],"templateHtml":"<canvas id=\"radialGauge\"></canvas>\n","templateCss":"","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbAnalogueRadialGauge(containerElement, settings, data, ''radialGauge'');    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged) {\n    gauge.redraw(width, height, data, sizeChanged);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },\n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"units\": {\n                \"title\": \"Units\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"majorTicksCount\": {\n                \"title\": \"Major ticks count\",\n                \"type\": \"number\",\n                \"default\": null\n            },\n            \"minorTicks\": {\n                \"title\": \"Minor ticks count\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"valueBox\": {\n                \"title\": \"Show value box\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"valueInt\": {\n                \"title\": \"Digits count for integer part of value\",\n                \"type\": \"number\",\n                \"default\": 3\n            },\n            \"valueDec\": {\n                \"title\": \"Digits count for decimal part of value\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorPlate\": {\n                \"title\": \"Plate color\",\n                \"type\": \"string\",\n                \"default\": \"#fff\"\n            },\n            \"colorMajorTicks\": {\n                \"title\": \"Major ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#444\"\n            },\n            \"colorMinorTicks\": {\n                \"title\": \"Minor ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorNeedle\": {\n                \"title\": \"Needle color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleEnd\": {\n                \"title\": \"Needle color - end gradient\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleShadowUp\": {\n                \"title\": \"Upper half of the needle shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(2,255,255,0.2)\"\n            },\n            \"colorNeedleShadowDown\": {\n                \"title\": \"Drop shadow needle color.\",\n                \"type\": \"string\",\n                \"default\": \"rgba(188,143,143,0.45)\"\n            },\n            \"colorValueBoxRect\": {\n                \"title\": \"Value box rectangle stroke color\",\n                \"type\": \"string\",\n                \"default\": \"#888\"\n            },\n            \"colorValueBoxRectEnd\": {\n                \"title\": \"Value box rectangle stroke color - end gradient\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorValueBoxBackground\": {\n                \"title\": \"Value box background color\",\n                \"type\": \"string\",\n                \"default\": \"#babab2\"\n            },\n            \"colorValueBoxShadow\": {\n                \"title\": \"Value box shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(0,0,0,1)\"\n            },\n            \"highlights\": {\n                \"title\": \"Highlights\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Highlight\",\n                  \"type\": \"object\",\n                  \"properties\": {\n                    \"from\": {\n                      \"title\": \"From\",\n                      \"type\": \"number\"\n                    },\n                    \"to\": {\n                      \"title\": \"To\",\n                      \"type\": \"number\"\n                    },\n                    \"color\": {\n                      \"title\": \"Color\",\n                      \"type\": \"string\"\n                    }\n                  }\n                }\n            },\n            \"highlightsWidth\": {\n                \"title\": \"Highlights width\",\n                \"type\": \"number\",\n                \"default\": 15\n            },\n            \"showBorder\": {\n                \"title\": \"Show border\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"numbersFont\": {\n                \"title\": \"Tick numbers font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"titleFont\": {\n                \"title\": \"Title text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 24\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"unitsFont\": {\n                \"title\": \"Units text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 22\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Value text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 40\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#444\"\n                    },\n                    \"shadowColor\": {\n                        \"title\": \"Shadow color\",\n                        \"type\": \"string\",\n                        \"default\": \"rgba(0,0,0,0.3)\"\n                    }\n                }\n            },\n            \"animation\": {\n                \"title\": \"Enable animation\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"animationDuration\": {\n                \"title\": \"Animation duration\",\n                \"type\": \"number\",\n                \"default\": 500\n            },\n            \"animationRule\": {\n                \"title\": \"Animation rule\",\n                \"type\": \"string\",\n                \"default\": \"cycle\"\n            },\n            \"startAngle\": {\n                \"title\": \"Start ticks angle\",\n                \"type\": \"number\",\n                \"default\": 45\n            },\n            \"ticksAngle\": {\n                \"title\": \"Ticks angle\",\n                \"type\": \"number\",\n                \"default\": 270\n            },\n            \"needleCircleSize\": {\n                \"title\": \"Needle circle size\",\n                \"type\": \"number\",\n                \"default\": 10\n            }\n        },\n        \"required\": []\n    },\n    \"form\": [\n        \"startAngle\",\n        \"ticksAngle\",\n        \"needleCircleSize\",\n        \"minValue\",\n        \"maxValue\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"units\",\n        \"majorTicksCount\",\n        \"minorTicks\",\n        \"valueBox\",\n        \"valueInt\",\n        \"valueDec\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorPlate\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMajorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMinorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedle\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowUp\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowDown\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRect\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRectEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxBackground\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxShadow\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"highlights\",\n            \"items\": [\n                \"highlights[].from\",\n                \"highlights[].to\",\n                {\n                    \"key\": \"highlights[].color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        \"highlightsWidth\",\n        \"showBorder\",\n        {\n            \"key\": \"numbersFont\",\n            \"items\": [\n                \"numbersFont.family\",\n                \"numbersFont.size\",\n                {\n                   \"key\": \"numbersFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"numbersFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"numbersFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"unitsFont\",\n            \"items\": [\n                \"unitsFont.family\",\n                \"unitsFont.size\",\n                {\n                   \"key\": \"unitsFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"unitsFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"unitsFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                },\n                {\n                    \"key\": \"valueFont.shadowColor\",\n                    \"type\": \"color\"\n                }\n            ]\n        },        \n        \"animation\",\n        \"animationDuration\",\n        {\n            \"key\": \"animationRule\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \"quad\",\n                    \"label\": \"Quad\"\n                },\n                {\n                    \"value\": \"quint\",\n                    \"label\": \"Quint\"\n                },\n                {\n                    \"value\": \"cycle\",\n                    \"label\": \"Cycle\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                },\n                {\n                    \"value\": \"elastic\",\n                    \"label\": \"Elastic\"\n                },\n                {\n                    \"value\": \"dequad\",\n                    \"label\": \"Dequad\"\n                },\n                {\n                    \"value\": \"dequint\",\n                    \"label\": \"Dequint\"\n                },\n                {\n                    \"value\": \"decycle\",\n                    \"label\": \"Decycle\"\n                },\n                {\n                    \"value\": \"debounce\",\n                    \"label\": \"Debounce\"\n                },\n                {\n                    \"value\": \"delastic\",\n                    \"label\": \"Delastic\"\n                }\n            ]\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temperature\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 40 - 20;\\nif (value < -60) {\\n\\tvalue = -60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":60,\"startAngle\":67.5,\"ticksAngle\":225,\"showBorder\":true,\"defaultColor\":\"#e65100\",\"needleCircleSize\":7,\"highlights\":[{\"from\":-60,\"to\":-50,\"color\":\"#42a5f5\"},{\"from\":-50,\"to\":-40,\"color\":\"rgba(66, 165, 245, 0.83)\"},{\"from\":-40,\"to\":-30,\"color\":\"rgba(66, 165, 245, 0.66)\"},{\"from\":-30,\"to\":-20,\"color\":\"rgba(66, 165, 245, 0.5)\"},{\"from\":-20,\"to\":-10,\"color\":\"rgba(66, 165, 245, 0.33)\"},{\"from\":-10,\"to\":0,\"color\":\"rgba(66, 165, 245, 0.16)\"},{\"from\":0,\"to\":10,\"color\":\"rgba(229, 115, 115, 0.16)\"},{\"from\":10,\"to\":20,\"color\":\"rgba(229, 115, 115, 0.33)\"},{\"from\":20,\"to\":30,\"color\":\"rgba(229, 115, 115, 0.5)\"},{\"from\":30,\"to\":40,\"color\":\"rgba(229, 115, 115, 0.66)\"},{\"from\":40,\"to\":50,\"color\":\"rgba(229, 115, 115, 0.83)\"},{\"from\":50,\"to\":60,\"color\":\"#e57373\"}],\"showUnitTitle\":true,\"colorPlate\":\"#cfd8dc\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"minorTicks\":2,\"valueInt\":3,\"valueDec\":1,\"highlightsWidth\":15,\"valueBox\":true,\"animation\":true,\"animationDuration\":1000,\"animationRule\":\"bounce\",\"colorNeedleShadowUp\":\"rgba(2, 255, 255, 0)\",\"colorNeedleShadowDown\":\"rgba(188, 143, 143, 0.78)\",\"units\":\"°C\",\"majorTicksCount\":12,\"numbersFont\":{\"family\":\"RobotoDraft\",\"size\":20,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":24,\"style\":\"normal\",\"weight\":\"normal\",\"color\":\"#263238\"},\"unitsFont\":{\"family\":\"RobotoDraft\",\"size\":28,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#616161\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"size\":30,\"style\":\"normal\",\"weight\":\"normal\",\"shadowColor\":\"rgba(0, 0, 0, 0.49)\",\"color\":\"#444\"},\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\",\"unitTitle\":\"Temperature\",\"minValue\":-60},\"title\":\"Temperature radial gauge - Canvas Gauges\"}"}',
+'Temperature radial gauge - Canvas Gauges' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'vertical_bar_justgage',
+'{"type":"latest","sizeX":2,"sizeY":3.5,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#f57c00\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"RobotoDraft\",\"style\":\"normal\",\"weight\":\"500\",\"size\":12,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":1.5,\"gaugeColor\":\"#eeeeee\",\"showTitle\":false,\"gaugeType\":\"verticalBar\"},\"title\":\"Vertical bar - justGage\"}"}',
+'Vertical bar - justGage' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'gauge_justgage',
+'{"type":"latest","sizeX":4,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#ffffff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":0.75,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#999999\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"RobotoDraft\",\"style\":\"normal\",\"weight\":\"500\",\"size\":36,\"color\":\"#666666\"},\"minMaxFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#666666\"},\"neonGlowBrightness\":0,\"decimals\":0,\"dashThickness\":0,\"gaugeColor\":\"#eeeeee\",\"showTitle\":true,\"gaugeType\":\"arc\"},\"title\":\"Gauge - justGage\"}"}',
+'Gauge - justGage' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'digital_thermometer',
+'{"type":"latest","sizeX":3,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < -60) {\\n\\tvalue = 60;\\n} else if (value > 60) {\\n\\tvalue = 60;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":60,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":1,\"levelColors\":[\"#304ffe\",\"#7e57c2\",\"#ff4081\",\"#d32f2f\"],\"refreshAnimationType\":\"<>\",\"refreshAnimationTime\":700,\"startAnimationType\":\"<>\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":18},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"dashThickness\":1.5,\"decimals\":0,\"minValue\":-60,\"units\":\"°C\",\"gaugeColor\":\"#333333\",\"neonGlowBrightness\":35,\"gaugeType\":\"donut\"},\"title\":\"Digital thermometer\"}"}',
+'Digital thermometer' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'analogue_gauges', 'linear_gauge_canvas_gauges',
+'{"type":"latest","sizeX":7,"sizeY":3,"resources":[],"templateHtml":"<canvas id=\"linearGauge\"></canvas>\n","templateCss":"","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbAnalogueLinearGauge(containerElement, settings, data, ''linearGauge'');    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data, timeWindow, sizeChanged) {\n    gauge.redraw(width, height, data, sizeChanged);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },\n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"units\": {\n                \"title\": \"Units\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"majorTicksCount\": {\n                \"title\": \"Major ticks count\",\n                \"type\": \"number\",\n                \"default\": null\n            },\n            \"minorTicks\": {\n                \"title\": \"Minor ticks count\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"valueBox\": {\n                \"title\": \"Show value box\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"valueInt\": {\n                \"title\": \"Digits count for integer part of value\",\n                \"type\": \"number\",\n                \"default\": 3\n            },\n            \"valueDec\": {\n                \"title\": \"Digits count for decimal part of value\",\n                \"type\": \"number\",\n                \"default\": 2\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorPlate\": {\n                \"title\": \"Plate color\",\n                \"type\": \"string\",\n                \"default\": \"#fff\"\n            },\n            \"colorMajorTicks\": {\n                \"title\": \"Major ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#444\"\n            },\n            \"colorMinorTicks\": {\n                \"title\": \"Minor ticks color\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorNeedle\": {\n                \"title\": \"Needle color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleEnd\": {\n                \"title\": \"Needle color - end gradient\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorNeedleShadowUp\": {\n                \"title\": \"Upper half of the needle shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(2,255,255,0.2)\"\n            },\n            \"colorNeedleShadowDown\": {\n                \"title\": \"Drop shadow needle color.\",\n                \"type\": \"string\",\n                \"default\": \"rgba(188,143,143,0.45)\"\n            },\n            \"colorValueBoxRect\": {\n                \"title\": \"Value box rectangle stroke color\",\n                \"type\": \"string\",\n                \"default\": \"#888\"\n            },\n            \"colorValueBoxRectEnd\": {\n                \"title\": \"Value box rectangle stroke color - end gradient\",\n                \"type\": \"string\",\n                \"default\": \"#666\"\n            },\n            \"colorValueBoxBackground\": {\n                \"title\": \"Value box background color\",\n                \"type\": \"string\",\n                \"default\": \"#babab2\"\n            },\n            \"colorValueBoxShadow\": {\n                \"title\": \"Value box shadow color\",\n                \"type\": \"string\",\n                \"default\": \"rgba(0,0,0,1)\"\n            },\n            \"highlights\": {\n                \"title\": \"Highlights\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Highlight\",\n                  \"type\": \"object\",\n                  \"properties\": {\n                    \"from\": {\n                      \"title\": \"From\",\n                      \"type\": \"number\"\n                    },\n                    \"to\": {\n                      \"title\": \"To\",\n                      \"type\": \"number\"\n                    },\n                    \"color\": {\n                      \"title\": \"Color\",\n                      \"type\": \"string\"\n                    }\n                  }\n                }\n            },\n            \"highlightsWidth\": {\n                \"title\": \"Highlights width\",\n                \"type\": \"number\",\n                \"default\": 15\n            },\n            \"showBorder\": {\n                \"title\": \"Show border\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"numbersFont\": {\n                \"title\": \"Tick numbers font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"titleFont\": {\n                \"title\": \"Title text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 24\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"unitsFont\": {\n                \"title\": \"Units text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 22\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#888\"\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Value text font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 40\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": \"#444\"\n                    },\n                    \"shadowColor\": {\n                        \"title\": \"Shadow color\",\n                        \"type\": \"string\",\n                        \"default\": \"rgba(0,0,0,0.3)\"\n                    }\n                }\n            },\n            \"animation\": {\n                \"title\": \"Enable animation\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },\n            \"animationDuration\": {\n                \"title\": \"Animation duration\",\n                \"type\": \"number\",\n                \"default\": 500\n            },\n            \"animationRule\": {\n                \"title\": \"Animation rule\",\n                \"type\": \"string\",\n                \"default\": \"cycle\"\n            },\n            \"barStrokeWidth\": {\n                \"title\": \"Bar stroke width\",\n                \"type\": \"number\",\n                \"default\": 2.5\n            },\n            \"colorBarStroke\": {\n                \"title\": \"Bar stroke color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorBar\": {\n                \"title\": \"Bar background color\",\n                \"type\": \"string\",\n                \"default\": \"#fff\"\n            },\n            \"colorBarEnd\": {\n                \"title\": \"Bar background color - end gradient\",\n                \"type\": \"string\",\n                \"default\": \"#ddd\"\n            },\n            \"colorBarProgress\": {\n                \"title\": \"Progress bar color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"colorBarProgressEnd\": {\n                \"title\": \"Progress bar color - end gradient\",\n                \"type\": \"string\",\n                \"default\": null\n            }        \n            \n        },\n        \"required\": []\n    },\n    \"form\": [\n        \"barStrokeWidth\",\n        {\n            \"key\": \"colorBarStroke\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorBar\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorBarEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorBarProgress\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorBarProgressEnd\",\n            \"type\": \"color\"\n        },\n        \"minValue\",\n        \"maxValue\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"units\",\n        \"majorTicksCount\",\n        \"minorTicks\",\n        \"valueBox\",\n        \"valueInt\",\n        \"valueDec\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorPlate\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMajorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorMinorTicks\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedle\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowUp\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorNeedleShadowDown\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRect\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxRectEnd\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxBackground\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"colorValueBoxShadow\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"highlights\",\n            \"items\": [\n                \"highlights[].from\",\n                \"highlights[].to\",\n                {\n                    \"key\": \"highlights[].color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        \"highlightsWidth\",\n        \"showBorder\",\n        {\n            \"key\": \"numbersFont\",\n            \"items\": [\n                \"numbersFont.family\",\n                \"numbersFont.size\",\n                {\n                   \"key\": \"numbersFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"numbersFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"numbersFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"unitsFont\",\n            \"items\": [\n                \"unitsFont.family\",\n                \"unitsFont.size\",\n                {\n                   \"key\": \"unitsFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"unitsFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"unitsFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                },\n                {\n                    \"key\": \"valueFont.shadowColor\",\n                    \"type\": \"color\"\n                }\n            ]\n        },        \n        \"animation\",\n        \"animationDuration\",\n        {\n            \"key\": \"animationRule\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \"quad\",\n                    \"label\": \"Quad\"\n                },\n                {\n                    \"value\": \"quint\",\n                    \"label\": \"Quint\"\n                },\n                {\n                    \"value\": \"cycle\",\n                    \"label\": \"Cycle\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                },\n                {\n                    \"value\": \"elastic\",\n                    \"label\": \"Elastic\"\n                },\n                {\n                    \"value\": \"dequad\",\n                    \"label\": \"Dequad\"\n                },\n                {\n                    \"value\": \"dequint\",\n                    \"label\": \"Dequint\"\n                },\n                {\n                    \"value\": \"decycle\",\n                    \"label\": \"Decycle\"\n                },\n                {\n                    \"value\": \"debounce\",\n                    \"label\": \"Debounce\"\n                },\n                {\n                    \"value\": \"delastic\",\n                    \"label\": \"Delastic\"\n                }\n            ]\n        }\n    ]\n}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 10 - 5;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"rgb(255, 255, 255)\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{\"maxValue\":100,\"defaultColor\":\"#e64a19\",\"barStrokeWidth\":2.5,\"colorBar\":\"#fff\",\"colorBarEnd\":\"#ddd\",\"showUnitTitle\":true,\"minorTicks\":2,\"valueBox\":true,\"valueInt\":3,\"valueDec\":0,\"colorPlate\":\"#fff\",\"colorMajorTicks\":\"#444\",\"colorMinorTicks\":\"#666\",\"colorNeedleShadowUp\":\"rgba(2,255,255,0.2)\",\"colorNeedleShadowDown\":\"rgba(188,143,143,0.45)\",\"colorValueBoxRect\":\"#888\",\"colorValueBoxRectEnd\":\"#666\",\"colorValueBoxBackground\":\"#babab2\",\"colorValueBoxShadow\":\"rgba(0,0,0,1)\",\"highlightsWidth\":10,\"animation\":true,\"animationDuration\":500,\"animationRule\":\"cycle\",\"showBorder\":false,\"majorTicksCount\":10,\"numbersFont\":{\"family\":\"RobotoDraft\",\"size\":18,\"style\":\"normal\",\"weight\":\"500\"},\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":24,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#888\"},\"unitsFont\":{\"family\":\"RobotoDraft\",\"size\":22,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#888\"},\"valueFont\":{\"family\":\"RobotoDraft\",\"size\":40,\"style\":\"normal\",\"weight\":\"500\",\"color\":\"#444\",\"shadowColor\":\"rgba(0,0,0,0.3)\"},\"minValue\":-100,\"highlights\":[]},\"title\":\"Linear gauge - Canvas Gauges\"}"}',
+'Linear gauge - Canvas Gauges' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'charts', 'pie_chart_js',
+'{"type":"latest","sizeX":8,"sizeY":6,"resources":[{"url":"https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.3.0/Chart.min.js"}],"templateHtml":"<canvas id=\"pieChart\"></canvas>\n","templateCss":"","controllerScript":"var chart;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n\n    var pieData = {\n        labels: [],\n        datasets: []\n    };\n\n    var dataset = {\n        data: [],\n        backgroundColor: [],\n        borderColor: [],\n        borderWidth: [],\n        hoverBackgroundColor: []\n    }\n    \n    pieData.datasets.push(dataset);\n    \n    for (var i in data) {\n        var dataKey = data[i].dataKey;\n        pieData.labels.push(dataKey.label);\n        dataset.data.push(0);\n        var hoverBackgroundColor = tinycolor(dataKey.color).lighten(15);\n        var borderColor = tinycolor(dataKey.color).darken();\n        dataset.backgroundColor.push(dataKey.color);\n        dataset.borderColor.push(''#fff'');\n        dataset.borderWidth.push(5);\n        dataset.hoverBackgroundColor.push(hoverBackgroundColor.toRgbString());\n    }\n\n    var ctx = $(''#pieChart'', containerElement);\n    chart = new Chart(ctx, {\n        type: ''pie'',\n        data: pieData,\n        options: {\n            maintainAspectRatio: false\n        }\n    });\n    \n}\n\nfns.redraw = function(containerElement, width, height, data,\n    timeWindow, sizeChanged) {\n\n    for (var i = 0; i < data.length; i++) {\n        var cellData = data[i];\n        if (cellData.data.length > 0) {\n             var tvPair = cellData.data[cellData.data.length - 1];\n             var value = tvPair[1];\n             chart.data.datasets[0].data[i] = parseFloat(value);\n        }\n    }\n  \n    chart.update();\n    if (sizeChanged) {\n        chart.resize();\n    }\n    \n};\n","settingsSchema":"{}","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"First\",\"color\":\"#2196f3\",\"settings\":{},\"_hash\":0.15479322438769105,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Second\",\"color\":\"#4caf50\",\"settings\":{},\"_hash\":0.545701115289893,\"funcBody\":\"var value = (prevValue-20) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+20;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Third\",\"color\":\"#f44336\",\"settings\":{},\"_hash\":0.2592906835158064,\"funcBody\":\"var value = (prevValue-40) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+40;\"},{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Fourth\",\"color\":\"#ffc107\",\"settings\":{},\"_hash\":0.12880275585455747,\"funcBody\":\"var value = (prevValue-50) + Math.random() * 2 - 1;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value+50;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":true,\"backgroundColor\":\"#fff\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"8px\",\"settings\":{},\"title\":\"Pie - Chart.js\"}"}',
+'Pie - Chart.js' );
+
+INSERT INTO "thingsboard"."widget_type" ( "id", "tenant_id", "bundle_alias", "alias", "descriptor", "name" )
+VALUES ( now ( ), minTimeuuid ( 0 ), 'digital_gauges', 'simple_neon_gauge_justgage',
+'{"type":"latest","sizeX":3,"sizeY":3,"resources":[],"templateHtml":"","templateCss":"#gauge {\n    text-align: center;\n   /* margin-left: -100px;\n    margin-right: -100px;*/\n    /*margin-top: -50px;*/\n    \n}\n","controllerScript":"var gauge;\n\nfns.init = function(containerElement, settings, datasources,\n    data) {\n    gauge = new TbDigitalGauge(containerElement, settings, data);    \n\n}\n\n\nfns.redraw = function(containerElement, width, height, data) {\n    gauge.redraw(data);\n};\n\nfns.destroy = function() {\n}\n","settingsSchema":"{\n    \"schema\": {\n        \"type\": \"object\",\n        \"title\": \"Settings\",\n        \"properties\": {\n            \"minValue\": {\n                \"title\": \"Minimum value\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"maxValue\": {\n                \"title\": \"Maximum value\",\n                \"type\": \"number\",\n                \"default\": 100\n            },            \n            \"gaugeType\": {\n                \"title\": \"Gauge type\",\n                \"type\": \"string\",\n                \"default\": \"arc\"\n            },         \n            \"donutStartAngle\": {\n                \"title\": \"Angle to start from when in donut mode\",\n                \"type\": \"number\",\n                \"default\": 90\n            },            \n            \"neonGlowBrightness\": {\n                \"title\": \"Neon glow effect brightness, (0-100), 0 - disable effect\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"dashThickness\": {\n                \"title\": \"Thickness of the stripes, 0 - no stripes\",\n                \"type\": \"number\",\n                \"default\": 0\n            },            \n            \"roundedLineCap\": {\n                \"title\": \"Display rounded line cap\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"title\": {\n                \"title\": \"Gauge title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showTitle\": {\n                \"title\": \"Show gauge title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"unitTitle\": {\n                \"title\": \"Unit title\",\n                \"type\": \"string\",\n                \"default\": null\n            },            \n            \"showUnitTitle\": {\n                \"title\": \"Show unit title\",\n                \"type\": \"boolean\",\n                \"default\": false\n            },            \n            \"showValue\": {\n                \"title\": \"Show value text\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"showMinMax\": {\n                \"title\": \"Show min and max values\",\n                \"type\": \"boolean\",\n                \"default\": true\n            },            \n            \"gaugeWidthScale\": {\n                \"title\": \"Width of the gauge element\",\n                \"type\": \"number\",\n                \"default\": 0.75\n            },\n            \"defaultColor\": {\n                \"title\": \"Default color\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"gaugeColor\": {\n                \"title\": \"Background color of the gauge element\",\n                \"type\": \"string\",\n                \"default\": null\n            },\n            \"levelColors\": {\n                \"title\": \"Colors of indicator, from lower to upper\",\n                \"type\": \"array\",\n                \"items\": {\n                  \"title\": \"Color\",\n                  \"type\": \"string\"\n                }\n            },\n            \"refreshAnimationType\": {\n                \"title\": \"Type of refresh animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"refreshAnimationTime\": {\n                \"title\": \"Duration of refresh animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"startAnimationType\": {\n                \"title\": \"Type of start animation\",\n                \"type\": \"string\",\n                \"default\": \">\"\n            },\n            \"startAnimationTime\": {\n                \"title\": \"Duration of start animation (ms)\",\n                \"type\": \"number\",\n                \"default\": 700\n            },\n            \"decimals\": {\n                \"title\": \"Number of digits after floating point\",\n                \"type\": \"number\",\n                \"default\": 0\n            },\n            \"units\": {\n                \"title\": \"Special symbol to show next to value\",\n                \"type\": \"string\",\n                \"default\": \"\"\n            },\n            \"titleFont\": {\n                \"title\": \"Gauge title font\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 12\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"labelFont\": {\n                \"title\": \"Font of label showing under value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 8\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"valueFont\": {\n                \"title\": \"Font of label showing current value\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 18\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            },\n            \"minMaxFont\": {\n                \"title\": \"Font of minimum and maximum labels\",\n                \"type\": \"object\",\n                 \"properties\": {\n                    \"family\": {\n                        \"title\": \"Font family\",\n                        \"type\": \"string\",\n                        \"default\": \"RobotoDraft\"\n                    },\n                    \"size\": {\n                      \"title\": \"Size\",\n                      \"type\": \"number\",\n                      \"default\": 10\n                    },\n                    \"style\": {\n                      \"title\": \"Style\",\n                      \"type\": \"string\",\n                      \"default\": \"normal\"\n                    },\n                    \"weight\": {\n                      \"title\": \"Weight\",\n                      \"type\": \"string\",\n                      \"default\": \"500\"\n                    },\n                    \"color\": {\n                        \"title\": \"color\",\n                        \"type\": \"string\",\n                        \"default\": null\n                    }\n                }\n            }\n        }\n    },\n    \"form\": [\n        \"minValue\",\n        \"maxValue\",\n        {\n           \"key\": \"gaugeType\",\n           \"type\": \"rc-select\",\n           \"multiple\": false,\n           \"items\": [\n               {\n                   \"value\": \"arc\",\n                   \"label\": \"Arc\"\n               },\n               {\n                   \"value\": \"donut\",\n                   \"label\": \"Donut\"\n               },\n               {\n                   \"value\": \"horizontalBar\",\n                   \"label\": \"Horizontal bar\"\n               },\n               {\n                   \"value\": \"verticalBar\",\n                   \"label\": \"Vertical bar\"\n               }\n            ]\n        },\n        \"donutStartAngle\",\n        \"neonGlowBrightness\",\n        \"dashThickness\",\n        \"roundedLineCap\",\n        \"title\",\n        \"showTitle\",\n        \"unitTitle\",\n        \"showUnitTitle\",\n        \"showValue\",\n        \"showMinMax\",\n        \"gaugeWidthScale\",\n        {\n            \"key\": \"defaultColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"gaugeColor\",\n            \"type\": \"color\"\n        },\n        {\n            \"key\": \"levelColors\",\n            \"items\": [\n                {\n                    \"key\": \"levelColors[]\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"refreshAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"refreshAnimationTime\",\n        {\n            \"key\": \"startAnimationType\",\n            \"type\": \"rc-select\",\n            \"multiple\": false,\n            \"items\": [\n                {\n                    \"value\": \"linear\",\n                    \"label\": \"Linear\"\n                },\n                {\n                    \"value\": \">\",\n                    \"label\": \">\"\n                },\n                {\n                    \"value\": \"<\",\n                    \"label\": \"<\"\n                },\n                {\n                    \"value\": \"<>\",\n                    \"label\": \"<>\"\n                },\n                {\n                    \"value\": \"bounce\",\n                    \"label\": \"Bounce\"\n                }\n            ]\n        },\n        \"startAnimationTime\",\n        \"decimals\",\n        \"units\",\n        {\n            \"key\": \"titleFont\",\n            \"items\": [\n                \"titleFont.family\",\n                \"titleFont.size\",\n                {\n                   \"key\": \"titleFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"titleFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"titleFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"labelFont\",\n            \"items\": [\n                \"labelFont.family\",\n                \"labelFont.size\",\n                {\n                   \"key\": \"labelFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"labelFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"labelFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"valueFont\",\n            \"items\": [\n                \"valueFont.family\",\n                \"valueFont.size\",\n                {\n                   \"key\": \"valueFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"valueFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"valueFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        },\n        {\n            \"key\": \"minMaxFont\",\n            \"items\": [\n                \"minMaxFont.family\",\n                \"minMaxFont.size\",\n                {\n                   \"key\": \"minMaxFont.style\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"italic\",\n                           \"label\": \"Italic\"\n                       },\n                       {\n                           \"value\": \"oblique\",\n                           \"label\": \"Oblique\"\n                       }\n                    ]\n                },\n                {\n                   \"key\": \"minMaxFont.weight\",\n                   \"type\": \"rc-select\",\n                   \"multiple\": false,\n                   \"items\": [\n                       {\n                           \"value\": \"normal\",\n                           \"label\": \"Normal\"\n                       },\n                       {\n                           \"value\": \"bold\",\n                           \"label\": \"Bold\"\n                       },\n                       {\n                           \"value\": \"bolder\",\n                           \"label\": \"Bolder\"\n                       },\n                       {\n                           \"value\": \"lighter\",\n                           \"label\": \"Lighter\"\n                       },\n                       {\n                           \"value\": \"100\",\n                           \"label\": \"100\"\n                       },\n                       {\n                           \"value\": \"200\",\n                           \"label\": \"200\"\n                       },\n                       {\n                           \"value\": \"300\",\n                           \"label\": \"300\"\n                       },\n                       {\n                           \"value\": \"400\",\n                           \"label\": \"400\"\n                       },\n                       {\n                           \"value\": \"500\",\n                           \"label\": \"500\"\n                       },\n                       {\n                           \"value\": \"600\",\n                           \"label\": \"600\"\n                       },\n                       {\n                           \"value\": \"700\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"800\",\n                           \"label\": \"800\"\n                       },\n                       {\n                           \"value\": \"900\",\n                           \"label\": \"900\"\n                       }\n                    ]\n                },\n                {\n                    \"key\": \"minMaxFont.color\",\n                    \"type\": \"color\"\n                }\n            ]\n        }\n    ]\n}\n    ","dataKeySettingsSchema":"{}\n","defaultConfig":"{\"datasources\":[{\"type\":\"function\",\"name\":\"function\",\"dataKeys\":[{\"name\":\"f(x)\",\"type\":\"function\",\"label\":\"Temp\",\"color\":\"#388e3c\",\"settings\":{},\"_hash\":0.7282710489093589,\"funcBody\":\"var value = prevValue + Math.random() * 20 - 10;\\nif (value < 0) {\\n\\tvalue = 0;\\n} else if (value > 100) {\\n\\tvalue = 100;\\n}\\nreturn value;\"}]}],\"timewindow\":{\"realtime\":{\"timewindowMs\":60000}},\"showTitle\":false,\"backgroundColor\":\"#000000\",\"color\":\"rgba(0, 0, 0, 0.87)\",\"padding\":\"0px\",\"settings\":{\"maxValue\":100,\"minValue\":0,\"donutStartAngle\":90,\"showValue\":true,\"showMinMax\":true,\"gaugeWidthScale\":1,\"levelColors\":[],\"refreshAnimationType\":\">\",\"refreshAnimationTime\":700,\"startAnimationType\":\">\",\"startAnimationTime\":700,\"titleFont\":{\"family\":\"RobotoDraft\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"labelFont\":{\"family\":\"RobotoDraft\",\"size\":8,\"style\":\"normal\",\"weight\":\"500\"},\"valueFont\":{\"family\":\"Segment7Standard\",\"style\":\"normal\",\"weight\":\"500\",\"size\":32},\"minMaxFont\":{\"family\":\"Segment7Standard\",\"size\":12,\"style\":\"normal\",\"weight\":\"500\"},\"neonGlowBrightness\":40,\"dashThickness\":1.5,\"decimals\":0,\"gaugeType\":\"donut\"},\"title\":\"Simple neon gauge - justGage\"}"}',
+'Simple neon gauge - justGage' );
+
+/** System plugins and rules **/
+INSERT INTO thingsboard.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access,
+configuration )
+VALUES ( minTimeuuid ( '2016-11-01 01:01:01+0000' ), minTimeuuid ( 0 ), 'System Telemetry Plugin', 'ACTIVE',
+'system telemetry plugin', 'telemetry',
+'org.thingsboard.server.extensions.core.plugin.telemetry.TelemetryStoragePlugin', true, '{}' );
+
+INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor,
+action )
+VALUES ( minTimeuuid ( '2016-11-01 01:01:02+0000' ), minTimeuuid ( 0 ), 'System Telemetry Rule', 'telemetry', 'ACTIVE',
+'system telemetry rule', 0,
+'[{"clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter", "name":"TelemetryFilter", "configuration": {"messageTypes":["POST_TELEMETRY","POST_ATTRIBUTES","GET_ATTRIBUTES"]}}]',
+null,
+'{"clazz":"org.thingsboard.server.extensions.core.action.telemetry.TelemetryPluginAction", "name":"TelemetryMsgConverterAction", "configuration":{}}'
+);
+
+INSERT INTO thingsboard.plugin ( id, tenant_id, name, state, search_text, api_token, plugin_class, public_access,
+configuration )
+VALUES ( minTimeuuid ( '2016-11-01 01:01:03+0000' ), minTimeuuid ( 0 ), 'System RPC Plugin', 'ACTIVE',
+'system rpc plugin', 'rpc', 'org.thingsboard.server.extensions.core.plugin.rpc.RpcPlugin', true, '{
+       "defaultTimeout": 20000
+     }' );
+
+/** SYSTEM **/

diff --git a/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java
new file mode 100644
index 0000000..e2f5acb
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/attributes/BaseAttributesServiceTest.java
@@ -0,0 +1,103 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.attributes;
+
+import com.datastax.driver.core.utils.UUIDs;
+import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.kv.AttributeKvEntry;
+import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
+import org.thingsboard.server.common.data.kv.KvEntry;
+import org.thingsboard.server.common.data.kv.StringDataEntry;
+import org.thingsboard.server.dao.service.AbstractServiceTest;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.thingsboard.server.common.data.DataConstants.CLIENT_SCOPE;
+import static org.thingsboard.server.common.data.DataConstants.DEVICE;
+
+/**
+ * @author Andrew Shvayka
+ */
+public class BaseAttributesServiceTest extends AbstractServiceTest {
+
+    @Autowired
+    private AttributesService attributesService;
+
+    @Before
+    public void before() {
+    }
+
+    @Test
+    public void saveAndFetch() throws Exception {
+        DeviceId deviceId = new DeviceId(UUIDs.timeBased());
+        KvEntry attrValue = new StringDataEntry("attribute1", "value1");
+        AttributeKvEntry attr = new BaseAttributeKvEntry(attrValue, 42L);
+        attributesService.save(deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attr)).get();
+        AttributeKvEntry saved = attributesService.find(deviceId, DataConstants.CLIENT_SCOPE, attr.getKey());
+        Assert.assertEquals(attr, saved);
+    }
+
+    @Test
+    public void saveMultipleTypeAndFetch() throws Exception {
+        DeviceId deviceId = new DeviceId(UUIDs.timeBased());
+        KvEntry attrOldValue = new StringDataEntry("attribute1", "value1");
+        AttributeKvEntry attrOld = new BaseAttributeKvEntry(attrOldValue, 42L);
+
+        attributesService.save(deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrOld)).get();
+        AttributeKvEntry saved = attributesService.find(deviceId, DataConstants.CLIENT_SCOPE, attrOld.getKey());
+        Assert.assertEquals(attrOld, saved);
+
+        KvEntry attrNewValue = new StringDataEntry("attribute1", "value2");
+        AttributeKvEntry attrNew = new BaseAttributeKvEntry(attrNewValue, 73L);
+        attributesService.save(deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrNew)).get();
+
+        saved = attributesService.find(deviceId, DataConstants.CLIENT_SCOPE, attrOld.getKey());
+        Assert.assertEquals(attrNew, saved);
+    }
+
+    @Test
+    public void findAll() throws Exception {
+        DeviceId deviceId = new DeviceId(UUIDs.timeBased());
+
+        KvEntry attrAOldValue = new StringDataEntry("A", "value1");
+        AttributeKvEntry attrAOld = new BaseAttributeKvEntry(attrAOldValue, 42L);
+        KvEntry attrANewValue = new StringDataEntry("A", "value2");
+        AttributeKvEntry attrANew = new BaseAttributeKvEntry(attrANewValue, 73L);
+        KvEntry attrBNewValue = new StringDataEntry("B", "value3");
+        AttributeKvEntry attrBNew = new BaseAttributeKvEntry(attrBNewValue, 73L);
+
+        attributesService.save(deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrAOld)).get();
+        attributesService.save(deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrANew)).get();
+        attributesService.save(deviceId, DataConstants.CLIENT_SCOPE, Collections.singletonList(attrBNew)).get();
+
+        List<AttributeKvEntry> saved = attributesService.findAll(deviceId, DataConstants.CLIENT_SCOPE);
+
+        Assert.assertNotNull(saved);
+        Assert.assertEquals(2, saved.size());
+
+        Assert.assertEquals(attrANew, saved.get(0));
+        Assert.assertEquals(attrBNew, saved.get(1));
+    }
+
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/CustomCassandraCQLUnit.java b/dao/src/test/java/org/thingsboard/server/dao/CustomCassandraCQLUnit.java
new file mode 100644
index 0000000..503fd6c
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/CustomCassandraCQLUnit.java
@@ -0,0 +1,97 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import org.cassandraunit.BaseCassandraUnit;
+import org.cassandraunit.CQLDataLoader;
+import org.cassandraunit.dataset.CQLDataSet;
+import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
+
+import com.datastax.driver.core.Cluster;
+import com.datastax.driver.core.Session;
+
+import java.util.List;
+
+public class CustomCassandraCQLUnit extends BaseCassandraUnit {
+    private List<CQLDataSet> dataSets;
+
+    public Session session;
+    public Cluster cluster;
+
+    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets) {
+        this.dataSets = dataSets;
+    }
+
+    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, int readTimeoutMillis) {
+        this.dataSets = dataSets;
+        this.readTimeoutMillis = readTimeoutMillis;
+    }
+
+    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, String configurationFileName) {
+        this(dataSets);
+        this.configurationFileName = configurationFileName;
+    }
+
+    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, String configurationFileName, int readTimeoutMillis) {
+        this(dataSets);
+        this.configurationFileName = configurationFileName;
+        this.readTimeoutMillis = readTimeoutMillis;
+    }
+
+    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, String configurationFileName, long startUpTimeoutMillis) {
+        super(startUpTimeoutMillis);
+        this.dataSets = dataSets;
+        this.configurationFileName = configurationFileName;
+    }
+
+    public CustomCassandraCQLUnit(List<CQLDataSet> dataSets, String configurationFileName, long startUpTimeoutMillis, int readTimeoutMillis) {
+        super(startUpTimeoutMillis);
+        this.dataSets = dataSets;
+        this.configurationFileName = configurationFileName;
+        this.readTimeoutMillis = readTimeoutMillis;
+    }
+
+    @Override
+    protected void load() {
+        String hostIp = EmbeddedCassandraServerHelper.getHost();
+        int port = EmbeddedCassandraServerHelper.getNativeTransportPort();
+        cluster = new Cluster.Builder().addContactPoints(hostIp).withPort(port).withSocketOptions(getSocketOptions())
+                .build();
+        session = cluster.connect();
+        CQLDataLoader dataLoader = new CQLDataLoader(session);
+        dataSets.forEach(dataLoader::load);
+        session = dataLoader.getSession();
+    }
+
+    @Override
+    protected void after() {
+        super.after();
+        try (Cluster c = cluster; Session s = session) {
+            session = null;
+            cluster = null;
+        }
+    }
+
+    // Getters for those who do not like to directly access fields
+
+    public Session getSession() {
+        return session;
+    }
+
+    public Cluster getCluster() {
+        return cluster;
+    }
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java
new file mode 100644
index 0000000..21b27ad
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao;
+
+import org.cassandraunit.dataset.cql.ClassPathCQLDataSet;
+import org.junit.ClassRule;
+import org.junit.extensions.cpsuite.ClasspathSuite;
+import org.junit.extensions.cpsuite.ClasspathSuite.ClassnameFilters;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+
+@RunWith(ClasspathSuite.class)
+@ClassnameFilters({
+        "org.thingsboard.server.dao.service.*Test",
+        "org.thingsboard.server.dao.kv.*Test",
+        "org.thingsboard.server.dao.plugin.*Test",
+        "org.thingsboard.server.dao.rule.*Test",
+        "org.thingsboard.server.dao.attributes.*Test",
+        "org.thingsboard.server.dao.timeseries.*Test"
+})
+public class DaoTestSuite {
+
+    @ClassRule
+    public static CustomCassandraCQLUnit cassandraUnit =
+            new CustomCassandraCQLUnit(
+                    Arrays.asList(new ClassPathCQLDataSet("schema.cql", false, false),
+                                  new ClassPathCQLDataSet("system-data.cql", false, false),
+                                  new ClassPathCQLDataSet("system-test.cql", false, false)),
+                    "cassandra-test.yaml", 30000l);
+
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java
new file mode 100644
index 0000000..ba346bf
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/event/BaseEventServiceTest.java
@@ -0,0 +1,138 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.event;
+
+import com.datastax.driver.core.utils.UUIDs;
+import org.apache.cassandra.utils.UUIDGen;
+import org.junit.Assert;
+import org.junit.Test;
+import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.EventId;
+import org.thingsboard.server.common.data.id.RuleId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TimePageData;
+import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.dao.service.AbstractServiceTest;
+
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.time.Month;
+import java.time.ZoneOffset;
+import java.util.List;
+import java.util.Optional;
+
+public class BaseEventServiceTest extends AbstractServiceTest {
+
+    @Test
+    public void saveEvent() throws Exception {
+        DeviceId devId = new DeviceId(UUIDs.timeBased());
+        Event event = generateEvent(null, devId, "ALARM", UUIDs.timeBased().toString());
+        Event saved = eventService.save(event);
+        Optional<Event> loaded = eventService.findEvent(event.getTenantId(), event.getEntityId(), event.getType(), event.getUid());
+        Assert.assertTrue(loaded.isPresent());
+        Assert.assertNotNull(loaded.get());
+        Assert.assertEquals(saved, loaded.get());
+    }
+
+    @Test
+    public void saveEventIfNotExists() throws Exception {
+        DeviceId devId = new DeviceId(UUIDs.timeBased());
+        Event event = generateEvent(null, devId, "ALARM", UUIDs.timeBased().toString());
+        Optional<Event> saved = eventService.saveIfNotExists(event);
+        Assert.assertTrue(saved.isPresent());
+        saved = eventService.saveIfNotExists(event);
+        Assert.assertFalse(saved.isPresent());
+    }
+
+    @Test
+    public void findEventsByTypeAndTimeAscOrder() throws Exception {
+        long timeBeforeStartTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 11, 30).toEpochSecond(ZoneOffset.UTC);
+        long startTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 12, 0).toEpochSecond(ZoneOffset.UTC);
+        long eventTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 12, 30).toEpochSecond(ZoneOffset.UTC);
+        long endTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 13, 0).toEpochSecond(ZoneOffset.UTC);
+        long timeAfterEndTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 13, 30).toEpochSecond(ZoneOffset.UTC);
+
+        RuleId ruleId = new RuleId(UUIDs.timeBased());
+        TenantId tenantId = new TenantId(UUIDs.timeBased());
+        saveEventWithProvidedTime(timeBeforeStartTime, ruleId, tenantId);
+        Event savedEvent = saveEventWithProvidedTime(eventTime, ruleId, tenantId);
+        Event savedEvent2 = saveEventWithProvidedTime(eventTime+1, ruleId, tenantId);
+        Event savedEvent3 = saveEventWithProvidedTime(eventTime+2, ruleId, tenantId);
+        saveEventWithProvidedTime(timeAfterEndTime, ruleId, tenantId);
+
+        TimePageData<Event> events = eventService.findEvents(tenantId, ruleId, DataConstants.STATS,
+                new TimePageLink(2, startTime, endTime, true));
+
+        Assert.assertNotNull(events.getData());
+        Assert.assertTrue(events.getData().size() == 2);
+        Assert.assertTrue(events.getData().get(0).getUuidId().equals(savedEvent.getUuidId()));
+        Assert.assertTrue(events.getData().get(1).getUuidId().equals(savedEvent2.getUuidId()));
+        Assert.assertTrue(events.hasNext());
+        Assert.assertNotNull(events.getNextPageLink());
+
+        events = eventService.findEvents(tenantId, ruleId, DataConstants.STATS, events.getNextPageLink());
+
+        Assert.assertNotNull(events.getData());
+        Assert.assertTrue(events.getData().size() == 1);
+        Assert.assertTrue(events.getData().get(0).getUuidId().equals(savedEvent3.getUuidId()));
+        Assert.assertFalse(events.hasNext());
+        Assert.assertNull(events.getNextPageLink());
+    }
+
+    @Test
+    public void findEventsByTypeAndTimeDescOrder() throws Exception {
+        long timeBeforeStartTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 11, 30).toEpochSecond(ZoneOffset.UTC);
+        long startTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 12, 0).toEpochSecond(ZoneOffset.UTC);
+        long eventTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 12, 30).toEpochSecond(ZoneOffset.UTC);
+        long endTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 13, 0).toEpochSecond(ZoneOffset.UTC);
+        long timeAfterEndTime = LocalDateTime.of(2016, Month.NOVEMBER, 1, 13, 30).toEpochSecond(ZoneOffset.UTC);
+
+        RuleId ruleId = new RuleId(UUIDs.timeBased());
+        TenantId tenantId = new TenantId(UUIDs.timeBased());
+        saveEventWithProvidedTime(timeBeforeStartTime, ruleId, tenantId);
+        Event savedEvent = saveEventWithProvidedTime(eventTime, ruleId, tenantId);
+        Event savedEvent2 = saveEventWithProvidedTime(eventTime+1, ruleId, tenantId);
+        Event savedEvent3 = saveEventWithProvidedTime(eventTime+2, ruleId, tenantId);
+        saveEventWithProvidedTime(timeAfterEndTime, ruleId, tenantId);
+
+        TimePageData<Event> events = eventService.findEvents(tenantId, ruleId, DataConstants.STATS,
+                new TimePageLink(2, startTime, endTime, false));
+
+        Assert.assertNotNull(events.getData());
+        Assert.assertTrue(events.getData().size() == 2);
+        Assert.assertTrue(events.getData().get(0).getUuidId().equals(savedEvent3.getUuidId()));
+        Assert.assertTrue(events.getData().get(1).getUuidId().equals(savedEvent2.getUuidId()));
+        Assert.assertTrue(events.hasNext());
+        Assert.assertNotNull(events.getNextPageLink());
+
+        events = eventService.findEvents(tenantId, ruleId, DataConstants.STATS, events.getNextPageLink());
+
+        Assert.assertNotNull(events.getData());
+        Assert.assertTrue(events.getData().size() == 1);
+        Assert.assertTrue(events.getData().get(0).getUuidId().equals(savedEvent.getUuidId()));
+        Assert.assertFalse(events.hasNext());
+        Assert.assertNull(events.getNextPageLink());
+    }
+
+    private Event saveEventWithProvidedTime(long time, EntityId entityId, TenantId tenantId) throws IOException {
+        Event event = generateEvent(tenantId, entityId, DataConstants.STATS, null);
+        event.setId(new EventId(UUIDs.startOf(time)));
+        return eventService.save(event);
+    }
+}
\ No newline at end of file

diff --git a/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java
new file mode 100644
index 0000000..4fd3d38
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/plugin/BasePluginServiceTest.java
@@ -0,0 +1,118 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.plugin;
+
+import java.util.UUID;
+
+import lombok.extern.slf4j.Slf4j;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.dao.service.AbstractServiceTest;
+import org.junit.Assert;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.datastax.driver.core.utils.UUIDs;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+@Slf4j
+public class BasePluginServiceTest extends AbstractServiceTest {
+
+  @Test
+  public void savePlugin() throws Exception {
+    PluginMetaData pluginMetaData = pluginService.savePlugin(generatePlugin(null, null));
+    Assert.assertNotNull(pluginMetaData.getId());
+    Assert.assertNotNull(pluginMetaData.getAdditionalInfo());
+
+    pluginMetaData.setAdditionalInfo(mapper.readTree("{\"description\":\"test\"}"));
+    PluginMetaData newPluginMetaData = pluginService.savePlugin(pluginMetaData);
+    Assert.assertEquals(pluginMetaData.getAdditionalInfo(), newPluginMetaData.getAdditionalInfo());
+
+  }
+
+  @Test
+  public void findPluginById() throws Exception {
+    PluginMetaData expected = pluginService.savePlugin(generatePlugin(null, null));
+    Assert.assertNotNull(expected.getId());
+    PluginMetaData found = pluginService.findPluginById(expected.getId());
+    Assert.assertEquals(expected, found);
+  }
+
+  @Test
+  public void findPluginByTenantIdAndApiToken() throws Exception {
+    String token = UUID.randomUUID().toString();
+    TenantId tenantId = new TenantId(UUIDs.timeBased());
+    pluginService.savePlugin(generatePlugin(null, null));
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    PluginMetaData expected = pluginService.savePlugin(generatePlugin(tenantId, token));
+    Assert.assertNotNull(expected.getId());
+    PluginMetaData found = pluginService.findPluginByApiToken(token);
+    Assert.assertEquals(expected, found);
+  }
+
+  @Test
+  public void findSystemPlugins() throws Exception {
+    TenantId systemTenant = new TenantId(ModelConstants.NULL_UUID); // system tenant id
+    pluginService.savePlugin(generatePlugin(null, null));
+    pluginService.savePlugin(generatePlugin(null, null));
+    pluginService.savePlugin(generatePlugin(systemTenant, null));
+    pluginService.savePlugin(generatePlugin(systemTenant, null));
+    TextPageData<PluginMetaData> found = pluginService.findSystemPlugins(new TextPageLink(100));
+    Assert.assertEquals(2, found.getData().size());
+    Assert.assertFalse(found.hasNext());
+  }
+
+  @Test
+  public void findTenantPlugins() throws Exception {
+    TenantId tenantId = new TenantId(UUIDs.timeBased());
+    pluginService.savePlugin(generatePlugin(null, null));
+    pluginService.savePlugin(generatePlugin(null, null));
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    TextPageData<PluginMetaData> found = pluginService.findTenantPlugins(tenantId, new TextPageLink(100));
+    Assert.assertEquals(3, found.getData().size());
+  }
+
+  @Test
+  public void deletePluginById() throws Exception {
+    PluginMetaData expected = pluginService.savePlugin(generatePlugin(null, null));
+    Assert.assertNotNull(expected.getId());
+    pluginService.deletePluginById(expected.getId());
+    PluginMetaData found = pluginService.findPluginById(expected.getId());
+    Assert.assertNull(found);
+  }
+
+  @Test
+  public void deletePluginsByTenantId() throws Exception {
+    TenantId tenantId = new TenantId(UUIDs.timeBased());
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    pluginService.savePlugin(generatePlugin(tenantId, null));
+    TextPageData<PluginMetaData> found = pluginService.findTenantPlugins(tenantId, new TextPageLink(100));
+    Assert.assertEquals(3, found.getData().size());
+    pluginService.deletePluginsByTenantId(tenantId);
+    found = pluginService.findTenantPlugins(tenantId, new TextPageLink(100));
+    Assert.assertEquals(0, found.getData().size());
+  }
+
+}
\ No newline at end of file

diff --git a/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java
new file mode 100644
index 0000000..12566ad
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/rule/BaseRuleServiceTest.java
@@ -0,0 +1,163 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.rule;
+
+import com.datastax.driver.core.utils.UUIDs;
+import org.junit.Assert;
+import org.junit.Test;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.dao.model.ModelConstants;
+import org.thingsboard.server.dao.service.AbstractServiceTest;
+
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class BaseRuleServiceTest extends AbstractServiceTest {
+
+    @Test
+    public void saveRule() throws Exception {
+        PluginMetaData plugin = generatePlugin(null, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        pluginService.savePlugin(plugin);
+        RuleMetaData ruleMetaData = ruleService.saveRule(generateRule(plugin.getTenantId(), null, plugin.getApiToken()));
+        Assert.assertNotNull(ruleMetaData.getId());
+        Assert.assertNotNull(ruleMetaData.getAdditionalInfo());
+        ruleMetaData.setAdditionalInfo(mapper.readTree("{\"description\":\"test\"}"));
+        RuleMetaData newRuleMetaData = ruleService.saveRule(ruleMetaData);
+        Assert.assertEquals(ruleMetaData.getAdditionalInfo(), newRuleMetaData.getAdditionalInfo());
+    }
+
+    @Test
+    public void findRuleById() throws Exception {
+        PluginMetaData plugin = generatePlugin(null, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        pluginService.savePlugin(plugin);
+
+        RuleMetaData expected = ruleService.saveRule(generateRule(plugin.getTenantId(), null, plugin.getApiToken()));
+        Assert.assertNotNull(expected.getId());
+        RuleMetaData found = ruleService.findRuleById(expected.getId());
+        Assert.assertEquals(expected, found);
+    }
+
+    @Test
+    public void findPluginRules() throws Exception {
+        TenantId tenantIdA = new TenantId(UUIDs.timeBased());
+        TenantId tenantIdB = new TenantId(UUIDs.timeBased());
+
+        PluginMetaData pluginA = generatePlugin(tenantIdA, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        PluginMetaData pluginB = generatePlugin(tenantIdB, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        pluginService.savePlugin(pluginA);
+        pluginService.savePlugin(pluginB);
+
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+
+        ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken()));
+
+        List<RuleMetaData> foundA = ruleService.findPluginRules(pluginA.getApiToken());
+        Assert.assertEquals(3, foundA.size());
+
+        List<RuleMetaData> foundB = ruleService.findPluginRules(pluginB.getApiToken());
+        Assert.assertEquals(2, foundB.size());
+    }
+
+    @Test
+    public void findSystemRules() throws Exception {
+        TenantId systemTenant = new TenantId(ModelConstants.NULL_UUID); // system tenant id
+
+        PluginMetaData plugin = generatePlugin(systemTenant, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        pluginService.savePlugin(plugin);
+        ruleService.saveRule(generateRule(systemTenant, null, plugin.getApiToken()));
+        ruleService.saveRule(generateRule(systemTenant, null, plugin.getApiToken()));
+        ruleService.saveRule(generateRule(systemTenant, null, plugin.getApiToken()));
+        TextPageData<RuleMetaData> found = ruleService.findSystemRules(new TextPageLink(100));
+        Assert.assertEquals(3, found.getData().size());
+    }
+
+    @Test
+    public void findTenantRules() throws Exception {
+        TenantId tenantIdA = new TenantId(UUIDs.timeBased());
+        TenantId tenantIdB = new TenantId(UUIDs.timeBased());
+
+        PluginMetaData pluginA = generatePlugin(tenantIdA, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        PluginMetaData pluginB = generatePlugin(tenantIdB, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        pluginService.savePlugin(pluginA);
+        pluginService.savePlugin(pluginB);
+
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+
+        ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken()));
+
+        TextPageData<RuleMetaData> foundA = ruleService.findTenantRules(tenantIdA, new TextPageLink(100));
+        Assert.assertEquals(3, foundA.getData().size());
+
+        TextPageData<RuleMetaData> foundB = ruleService.findTenantRules(tenantIdB, new TextPageLink(100));
+        Assert.assertEquals(2, foundB.getData().size());
+    }
+
+    @Test
+    public void deleteRuleById() throws Exception {
+        PluginMetaData plugin = generatePlugin(null, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        pluginService.savePlugin(plugin);
+
+        RuleMetaData expected = ruleService.saveRule(generateRule(plugin.getTenantId(), null, plugin.getApiToken()));
+        Assert.assertNotNull(expected.getId());
+        RuleMetaData found = ruleService.findRuleById(expected.getId());
+        Assert.assertEquals(expected, found);
+        ruleService.deleteRuleById(expected.getId());
+        found = ruleService.findRuleById(expected.getId());
+        Assert.assertNull(found);
+    }
+
+    @Test
+    public void deleteRulesByTenantId() throws Exception {
+        TenantId tenantIdA = new TenantId(UUIDs.timeBased());
+        TenantId tenantIdB = new TenantId(UUIDs.timeBased());
+
+        PluginMetaData pluginA = generatePlugin(tenantIdA, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        PluginMetaData pluginB = generatePlugin(tenantIdB, "testPluginToken" + ThreadLocalRandom.current().nextInt());
+        pluginService.savePlugin(pluginA);
+        pluginService.savePlugin(pluginB);
+
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdA, null, pluginA.getApiToken()));
+
+        ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken()));
+        ruleService.saveRule(generateRule(tenantIdB, null, pluginB.getApiToken()));
+
+        TextPageData<RuleMetaData> foundA = ruleService.findTenantRules(tenantIdA, new TextPageLink(100));
+        Assert.assertEquals(3, foundA.getData().size());
+
+        TextPageData<RuleMetaData> foundB = ruleService.findTenantRules(tenantIdB, new TextPageLink(100));
+        Assert.assertEquals(2, foundB.getData().size());
+
+        ruleService.deleteRulesByTenantId(tenantIdA);
+
+        foundA = ruleService.findTenantRules(tenantIdA, new TextPageLink(100));
+        Assert.assertEquals(0, foundA.getData().size());
+
+        foundB = ruleService.findTenantRules(tenantIdB, new TextPageLink(100));
+        Assert.assertEquals(2, foundB.getData().size());
+    }
+}
\ No newline at end of file

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
new file mode 100644
index 0000000..8d60568
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AbstractServiceTest.java
@@ -0,0 +1,221 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.fasterxml.jackson.databind.node.TextNode;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+import org.thingsboard.server.common.data.BaseData;
+import org.thingsboard.server.common.data.Event;
+import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UUIDBased;
+import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
+import org.thingsboard.server.common.data.plugin.ComponentScope;
+import org.thingsboard.server.common.data.plugin.ComponentType;
+import org.thingsboard.server.common.data.plugin.PluginMetaData;
+import org.thingsboard.server.common.data.rule.RuleMetaData;
+import org.thingsboard.server.dao.component.ComponentDescriptorService;
+import org.thingsboard.server.dao.customer.CustomerService;
+import org.thingsboard.server.dao.dashboard.DashboardService;
+import org.thingsboard.server.dao.device.DeviceCredentialsService;
+import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.event.EventService;
+import org.thingsboard.server.dao.plugin.PluginService;
+import org.thingsboard.server.dao.rule.RuleService;
+import org.thingsboard.server.dao.settings.AdminSettingsService;
+import org.thingsboard.server.dao.tenant.TenantService;
+import org.thingsboard.server.dao.timeseries.TimeseriesService;
+import org.thingsboard.server.dao.user.UserService;
+import org.thingsboard.server.dao.widget.WidgetTypeService;
+import org.thingsboard.server.dao.widget.WidgetsBundleService;
+
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.UUID;
+import java.util.concurrent.ThreadLocalRandom;
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration(classes = AbstractServiceTest.class, loader = AnnotationConfigContextLoader.class)
+@TestPropertySource(locations = {"classpath:cassandra-test.properties", "classpath:application-test.properties"})
+@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS)
+@Configuration
+@EnableAutoConfiguration
+@ComponentScan("org.thingsboard.server")
+public abstract class AbstractServiceTest {
+
+    protected ObjectMapper mapper = new ObjectMapper();
+
+    @Autowired
+    protected UserService userService;
+
+    @Autowired
+    protected AdminSettingsService adminSettingsService;
+
+    @Autowired
+    protected TenantService tenantService;
+
+    @Autowired
+    protected CustomerService customerService;
+
+    @Autowired
+    protected DeviceService deviceService;
+
+    @Autowired
+    protected DeviceCredentialsService deviceCredentialsService;
+
+    @Autowired
+    protected WidgetsBundleService widgetsBundleService;
+
+    @Autowired
+    protected WidgetTypeService widgetTypeService;
+
+    @Autowired
+    protected DashboardService dashboardService;
+
+    @Autowired
+    protected TimeseriesService tsService;
+
+    @Autowired
+    protected PluginService pluginService;
+
+    @Autowired
+    protected RuleService ruleService;
+
+    @Autowired
+    protected EventService eventService;
+
+    @Autowired
+    private ComponentDescriptorService componentDescriptorService;
+
+    class IdComparator<D extends BaseData<? extends UUIDBased>> implements Comparator<D> {
+        @Override
+        public int compare(D o1, D o2) {
+            return o1.getId().getId().compareTo(o2.getId().getId());
+        }
+    }
+
+
+    protected Event generateEvent(TenantId tenantId, EntityId entityId, String eventType, String eventUid) throws IOException {
+        if (tenantId == null) {
+            tenantId = new TenantId(UUIDs.timeBased());
+        }
+        Event event = new Event();
+        event.setTenantId(tenantId);
+        event.setEntityId(entityId);
+        event.setType(eventType);
+        event.setUid(eventUid);
+        event.setBody(readFromResource("TestJsonData.json"));
+        return event;
+    }
+
+    protected PluginMetaData generatePlugin(TenantId tenantId, String token) throws IOException {
+        return generatePlugin(tenantId, token, "org.thingsboard.component.PluginTest", "org.thingsboard.component.ActionTest", "TestJsonDescriptor.json", "TestJsonData.json");
+    }
+
+    protected PluginMetaData generatePlugin(TenantId tenantId, String token, String clazz, String actions, String configurationDescriptorResource, String dataResource) throws IOException {
+        if (tenantId == null) {
+            tenantId = new TenantId(UUIDs.timeBased());
+        }
+        if (token == null) {
+            token = UUID.randomUUID().toString();
+        }
+        getOrCreateDescriptor(ComponentScope.TENANT, ComponentType.PLUGIN, clazz, configurationDescriptorResource, actions);
+        PluginMetaData pluginMetaData = new PluginMetaData();
+        pluginMetaData.setName("Testing");
+        pluginMetaData.setClazz(clazz);
+        pluginMetaData.setTenantId(tenantId);
+        pluginMetaData.setApiToken(token);
+        pluginMetaData.setAdditionalInfo(mapper.readTree("{\"test\":\"test\"}"));
+        try {
+            pluginMetaData.setConfiguration(readFromResource(dataResource));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return pluginMetaData;
+    }
+
+    private ComponentDescriptor getOrCreateDescriptor(ComponentScope scope, ComponentType type, String clazz, String configurationDescriptorResource) throws IOException {
+        return getOrCreateDescriptor(scope, type, clazz, configurationDescriptorResource, null);
+    }
+
+    private ComponentDescriptor getOrCreateDescriptor(ComponentScope scope, ComponentType type, String clazz, String configurationDescriptorResource, String actions) throws IOException {
+        ComponentDescriptor descriptor = componentDescriptorService.findByClazz(clazz);
+        if (descriptor == null) {
+            descriptor = new ComponentDescriptor();
+            descriptor.setName("test");
+            descriptor.setClazz(clazz);
+            descriptor.setScope(scope);
+            descriptor.setType(type);
+            descriptor.setActions(actions);
+            descriptor.setConfigurationDescriptor(readFromResource(configurationDescriptorResource));
+            componentDescriptorService.saveComponent(descriptor);
+        }
+        return descriptor;
+    }
+
+    public JsonNode readFromResource(String resourceName) throws IOException {
+        return mapper.readTree(this.getClass().getClassLoader().getResourceAsStream(resourceName));
+    }
+
+    protected RuleMetaData generateRule(TenantId tenantId, Integer weight, String pluginToken) throws IOException {
+        if (tenantId == null) {
+            tenantId = new TenantId(UUIDs.timeBased());
+        }
+        if (weight == null) {
+            weight = ThreadLocalRandom.current().nextInt();
+        }
+
+        RuleMetaData ruleMetaData = new RuleMetaData();
+        ruleMetaData.setName("Testing");
+        ruleMetaData.setTenantId(tenantId);
+        ruleMetaData.setWeight(weight);
+        ruleMetaData.setPluginToken(pluginToken);
+
+        ruleMetaData.setAction(createNode(ComponentScope.TENANT, ComponentType.ACTION,
+                "org.thingsboard.component.ActionTest", "TestJsonDescriptor.json", "TestJsonData.json"));
+        ruleMetaData.setProcessor(createNode(ComponentScope.TENANT, ComponentType.PROCESSOR,
+                "org.thingsboard.component.ProcessorTest", "TestJsonDescriptor.json", "TestJsonData.json"));
+        ruleMetaData.setFilters(mapper.createArrayNode().add(
+                createNode(ComponentScope.TENANT, ComponentType.FILTER,
+                        "org.thingsboard.component.FilterTest", "TestJsonDescriptor.json", "TestJsonData.json")
+        ));
+
+        ruleMetaData.setAdditionalInfo(mapper.readTree("{}"));
+        return ruleMetaData;
+    }
+
+    protected JsonNode createNode(ComponentScope scope, ComponentType type, String clazz, String configurationDescriptor, String configuration) throws IOException {
+        getOrCreateDescriptor(scope, type, clazz, configurationDescriptor);
+        ObjectNode oNode = mapper.createObjectNode();
+        oNode.set("name", new TextNode("test action"));
+        oNode.set("clazz", new TextNode(clazz));
+        oNode.set("configuration", readFromResource(configuration));
+        return oNode;
+    }
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceImplTest.java
new file mode 100644
index 0000000..4e06e49
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/AdminSettingsServiceImplTest.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import org.thingsboard.server.common.data.AdminSettings;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+
+public class AdminSettingsServiceImplTest extends AbstractServiceTest {
+
+    @Test
+    public void testFindAdminSettingsByKey() {
+        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey("general");
+        Assert.assertNotNull(adminSettings);
+        adminSettings = adminSettingsService.findAdminSettingsByKey("mail");
+        Assert.assertNotNull(adminSettings);
+        adminSettings = adminSettingsService.findAdminSettingsByKey("unknown");
+        Assert.assertNull(adminSettings);
+    }
+    
+    @Test
+    public void testFindAdminSettingsById() {
+        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey("general");
+        AdminSettings foundAdminSettings = adminSettingsService.findAdminSettingsById(adminSettings.getId());
+        Assert.assertNotNull(foundAdminSettings);
+        Assert.assertEquals(adminSettings, foundAdminSettings);
+    }
+    
+    @Test
+    public void testSaveAdminSettings() throws Exception {
+        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey("general");
+        JsonNode json = adminSettings.getJsonValue();
+        ((ObjectNode) json).put("baseUrl", "http://myhost.org");
+        adminSettings.setJsonValue(json);
+        adminSettingsService.saveAdminSettings(adminSettings);
+        AdminSettings savedAdminSettings = adminSettingsService.findAdminSettingsByKey("general");
+        Assert.assertNotNull(savedAdminSettings);
+        Assert.assertEquals(adminSettings.getJsonValue(), savedAdminSettings.getJsonValue());
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testCreateAdminSettings() throws Exception {
+        AdminSettings adminSettings = new AdminSettings();
+        adminSettings.setKey("someKey");
+        adminSettings.setJsonValue(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        adminSettingsService.saveAdminSettings(adminSettings);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveAdminSettingsWithEmptyKey() {
+        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey("mail");
+        adminSettings.setKey(null);
+        adminSettingsService.saveAdminSettings(adminSettings);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testChangeAdminSettingsKey() {
+        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey("mail");
+        adminSettings.setKey("newKey");
+        adminSettingsService.saveAdminSettings(adminSettings);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveAdminSettingsWithNewJsonStructure() throws Exception {
+        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey("mail");
+        JsonNode json = adminSettings.getJsonValue();
+        ((ObjectNode) json).put("newKey", "my new value");
+        adminSettings.setJsonValue(json);
+        adminSettingsService.saveAdminSettings(adminSettings);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveAdminSettingsWithNonTextValue() throws Exception {
+        AdminSettings adminSettings = adminSettingsService.findAdminSettingsByKey("mail");
+        JsonNode json = adminSettings.getJsonValue();
+        ((ObjectNode) json).put("timeout", 10000L);
+        adminSettings.setJsonValue(json);
+        adminSettingsService.saveAdminSettings(adminSettings);
+    }
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java
new file mode 100644
index 0000000..f9df77f
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/CustomerServiceImplTest.java
@@ -0,0 +1,249 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.After;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.datastax.driver.core.utils.UUIDs;
+
+public class CustomerServiceImplTest extends AbstractServiceTest {
+    
+    private IdComparator<Customer> idComparator = new IdComparator<>();
+    
+    private TenantId tenantId;
+    
+    @Before
+    public void before() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        tenantId = savedTenant.getId();
+    }
+
+    @After
+    public void after() {
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test
+    public void testSaveCustomer() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle("My customer");
+        Customer savedCustomer = customerService.saveCustomer(customer);
+        
+        Assert.assertNotNull(savedCustomer);
+        Assert.assertNotNull(savedCustomer.getId());
+        Assert.assertTrue(savedCustomer.getCreatedTime() > 0);
+        Assert.assertEquals(customer.getTenantId(), savedCustomer.getTenantId());
+        Assert.assertEquals(customer.getTitle(), savedCustomer.getTitle());
+        
+        
+        savedCustomer.setTitle("My new customer");
+        
+        customerService.saveCustomer(savedCustomer);
+        Customer foundCustomer = customerService.findCustomerById(savedCustomer.getId());
+        Assert.assertEquals(foundCustomer.getTitle(), savedCustomer.getTitle());
+        
+        customerService.deleteCustomer(savedCustomer.getId());
+    }
+    
+    @Test
+    public void testFindCustomerById() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle("My customer");
+        Customer savedCustomer = customerService.saveCustomer(customer);
+        Customer foundCustomer = customerService.findCustomerById(savedCustomer.getId());
+        Assert.assertNotNull(foundCustomer);
+        Assert.assertEquals(savedCustomer, foundCustomer);
+        customerService.deleteCustomer(savedCustomer.getId());
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveCustomerWithEmptyTitle() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customerService.saveCustomer(customer);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveCustomerWithEmptyTenant() {
+        Customer customer = new Customer();
+        customer.setTitle("My customer");
+        customerService.saveCustomer(customer);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveCustomerWithInvalidTenant() {
+        Customer customer = new Customer();
+        customer.setTitle("My customer");
+        customer.setTenantId(new TenantId(UUIDs.timeBased()));
+        customerService.saveCustomer(customer);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveCustomerWithInvalidEmail() {
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle("My customer");
+        customer.setEmail("invalid@mail");
+        customerService.saveCustomer(customer);
+    }
+    
+    @Test
+    public void testDeleteCustomer() {
+        Customer customer = new Customer();
+        customer.setTitle("My customer");
+        customer.setTenantId(tenantId);
+        Customer savedCustomer = customerService.saveCustomer(customer);
+        customerService.deleteCustomer(savedCustomer.getId());
+        Customer foundCustomer = customerService.findCustomerById(savedCustomer.getId());
+        Assert.assertNull(foundCustomer);
+    }
+    
+    @Test
+    public void testFindCustomersByTenantId() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        List<Customer> customers = new ArrayList<>();
+        for (int i=0;i<135;i++) {
+            Customer customer = new Customer();
+            customer.setTenantId(tenantId);
+            customer.setTitle("Customer"+i);
+            customers.add(customerService.saveCustomer(customer));
+        }
+        
+        List<Customer> loadedCustomers = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(23);
+        TextPageData<Customer> pageData = null;
+        do {
+            pageData = customerService.findCustomersByTenantId(tenantId, pageLink);
+            loadedCustomers.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(customers, idComparator);
+        Collections.sort(loadedCustomers, idComparator);
+        
+        Assert.assertEquals(customers, loadedCustomers);
+        
+        customerService.deleteCustomersByTenantId(tenantId);
+
+        pageLink = new TextPageLink(33);
+        pageData = customerService.findCustomersByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        
+        tenantService.deleteTenant(tenantId);
+    }
+    
+    @Test
+    public void testFindCustomersByTenantIdAndTitle() {
+        String title1 = "Customer title 1";
+        List<Customer> customersTitle1 = new ArrayList<>();
+        for (int i=0;i<143;i++) {
+            Customer customer = new Customer();
+            customer.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(Math.random()*15));
+            String title = title1+suffix;
+            title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
+            customer.setTitle(title);
+            customersTitle1.add(customerService.saveCustomer(customer));
+        }
+        String title2 = "Customer title 2";
+        List<Customer> customersTitle2 = new ArrayList<>();
+        for (int i=0;i<175;i++) {
+            Customer customer = new Customer();
+            customer.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(Math.random()*15));
+            String title = title2+suffix;
+            title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
+            customer.setTitle(title);
+            customersTitle2.add(customerService.saveCustomer(customer));
+        }
+        
+        List<Customer> loadedCustomersTitle1 = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(15, title1);
+        TextPageData<Customer> pageData = null;
+        do {
+            pageData = customerService.findCustomersByTenantId(tenantId, pageLink);
+            loadedCustomersTitle1.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(customersTitle1, idComparator);
+        Collections.sort(loadedCustomersTitle1, idComparator);
+        
+        Assert.assertEquals(customersTitle1, loadedCustomersTitle1);
+        
+        List<Customer> loadedCustomersTitle2 = new ArrayList<>();
+        pageLink = new TextPageLink(4, title2);
+        do {
+            pageData = customerService.findCustomersByTenantId(tenantId, pageLink);
+            loadedCustomersTitle2.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(customersTitle2, idComparator);
+        Collections.sort(loadedCustomersTitle2, idComparator);
+        
+        Assert.assertEquals(customersTitle2, loadedCustomersTitle2);
+
+        for (Customer customer : loadedCustomersTitle1) {
+            customerService.deleteCustomer(customer.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title1);
+        pageData = customerService.findCustomersByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        for (Customer customer : loadedCustomersTitle2) {
+            customerService.deleteCustomer(customer.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title2);
+        pageData = customerService.findCustomersByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+    }
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java
new file mode 100644
index 0000000..842463c
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DashboardServiceImplTest.java
@@ -0,0 +1,414 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import com.datastax.driver.core.utils.UUIDs;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Dashboard;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class DashboardServiceImplTest extends AbstractServiceTest {
+    
+    private IdComparator<Dashboard> idComparator = new IdComparator<>();
+    
+    private TenantId tenantId;
+
+    @Before
+    public void before() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        tenantId = savedTenant.getId();
+    }
+
+    @After
+    public void after() {
+        tenantService.deleteTenant(tenantId);
+    }
+    
+    @Test
+    public void testSaveDashboard() throws IOException {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTenantId(tenantId);
+        dashboard.setTitle("My dashboard");
+        Dashboard savedDashboard = dashboardService.saveDashboard(dashboard);
+        
+        Assert.assertNotNull(savedDashboard);
+        Assert.assertNotNull(savedDashboard.getId());
+        Assert.assertTrue(savedDashboard.getCreatedTime() > 0);
+        Assert.assertEquals(dashboard.getTenantId(), savedDashboard.getTenantId());
+        Assert.assertNotNull(savedDashboard.getCustomerId());
+        Assert.assertEquals(ModelConstants.NULL_UUID, savedDashboard.getCustomerId().getId());
+        Assert.assertEquals(dashboard.getTitle(), savedDashboard.getTitle());
+        
+        savedDashboard.setTitle("My new dashboard");
+        
+        dashboardService.saveDashboard(savedDashboard);
+        Dashboard foundDashboard = dashboardService.findDashboardById(savedDashboard.getId());
+        Assert.assertEquals(foundDashboard.getTitle(), savedDashboard.getTitle());
+        
+        dashboardService.deleteDashboard(savedDashboard.getId());
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveDashboardWithEmptyTitle() {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTenantId(tenantId);
+        dashboardService.saveDashboard(dashboard);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveDashboardWithEmptyTenant() {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTitle("My dashboard");
+        dashboardService.saveDashboard(dashboard);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveDashboardWithInvalidTenant() {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTitle("My dashboard");
+        dashboard.setTenantId(new TenantId(UUIDs.timeBased()));
+        dashboardService.saveDashboard(dashboard);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testAssignDashboardToNonExistentCustomer() {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTitle("My dashboard");
+        dashboard.setTenantId(tenantId);
+        dashboard = dashboardService.saveDashboard(dashboard);
+        try {
+            dashboardService.assignDashboardToCustomer(dashboard.getId(), new CustomerId(UUIDs.timeBased()));
+        } finally {
+            dashboardService.deleteDashboard(dashboard.getId());
+        }
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testAssignDashboardToCustomerFromDifferentTenant() {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTitle("My dashboard");
+        dashboard.setTenantId(tenantId);
+        dashboard = dashboardService.saveDashboard(dashboard);
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test different tenant");
+        tenant = tenantService.saveTenant(tenant);
+        Customer customer = new Customer();
+        customer.setTenantId(tenant.getId());
+        customer.setTitle("Test different customer");
+        customer = customerService.saveCustomer(customer);
+        try {
+            dashboardService.assignDashboardToCustomer(dashboard.getId(), customer.getId());
+        } finally {
+            dashboardService.deleteDashboard(dashboard.getId());
+            tenantService.deleteTenant(tenant.getId());
+        }
+    }
+    
+    @Test
+    public void testFindDashboardById() {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTenantId(tenantId);
+        dashboard.setTitle("My dashboard");
+        Dashboard savedDashboard = dashboardService.saveDashboard(dashboard);
+        Dashboard foundDashboard = dashboardService.findDashboardById(savedDashboard.getId());
+        Assert.assertNotNull(foundDashboard);
+        Assert.assertEquals(savedDashboard, foundDashboard);
+        dashboardService.deleteDashboard(savedDashboard.getId());
+    }
+    
+    @Test
+    public void testDeleteDashboard() {
+        Dashboard dashboard = new Dashboard();
+        dashboard.setTenantId(tenantId);
+        dashboard.setTitle("My dashboard");
+        Dashboard savedDashboard = dashboardService.saveDashboard(dashboard);
+        Dashboard foundDashboard = dashboardService.findDashboardById(savedDashboard.getId());
+        Assert.assertNotNull(foundDashboard);
+        dashboardService.deleteDashboard(savedDashboard.getId());
+        foundDashboard = dashboardService.findDashboardById(savedDashboard.getId());
+        Assert.assertNull(foundDashboard);
+    }
+    
+    @Test
+    public void testFindDashboardsByTenantId() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        List<Dashboard> dashboards = new ArrayList<>();
+        for (int i=0;i<165;i++) {
+            Dashboard dashboard = new Dashboard();
+            dashboard.setTenantId(tenantId);
+            dashboard.setTitle("Dashboard"+i);
+            dashboards.add(dashboardService.saveDashboard(dashboard));
+        }
+        
+        List<Dashboard> loadedDashboards = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(16);
+        TextPageData<Dashboard> pageData = null;
+        do {
+            pageData = dashboardService.findDashboardsByTenantId(tenantId, pageLink);
+            loadedDashboards.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(dashboards, idComparator);
+        Collections.sort(loadedDashboards, idComparator);
+        
+        Assert.assertEquals(dashboards, loadedDashboards);
+        
+        dashboardService.deleteDashboardsByTenantId(tenantId);
+
+        pageLink = new TextPageLink(31);
+        pageData = dashboardService.findDashboardsByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        
+        tenantService.deleteTenant(tenantId);
+    }
+    
+    @Test
+    public void testFindDashboardsByTenantIdAndTitle() {
+        String title1 = "Dashboard title 1";
+        List<Dashboard> dashboardsTitle1 = new ArrayList<>();
+        for (int i=0;i<123;i++) {
+            Dashboard dashboard = new Dashboard();
+            dashboard.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(Math.random()*17));
+            String title = title1+suffix;
+            title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
+            dashboard.setTitle(title);
+            dashboardsTitle1.add(dashboardService.saveDashboard(dashboard));
+        }
+        String title2 = "Dashboard title 2";
+        List<Dashboard> dashboardsTitle2 = new ArrayList<>();
+        for (int i=0;i<193;i++) {
+            Dashboard dashboard = new Dashboard();
+            dashboard.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(Math.random()*15));
+            String title = title2+suffix;
+            title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
+            dashboard.setTitle(title);
+            dashboardsTitle2.add(dashboardService.saveDashboard(dashboard));
+        }
+        
+        List<Dashboard> loadedDashboardsTitle1 = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(19, title1);
+        TextPageData<Dashboard> pageData = null;
+        do {
+            pageData = dashboardService.findDashboardsByTenantId(tenantId, pageLink);
+            loadedDashboardsTitle1.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(dashboardsTitle1, idComparator);
+        Collections.sort(loadedDashboardsTitle1, idComparator);
+        
+        Assert.assertEquals(dashboardsTitle1, loadedDashboardsTitle1);
+        
+        List<Dashboard> loadedDashboardsTitle2 = new ArrayList<>();
+        pageLink = new TextPageLink(4, title2);
+        do {
+            pageData = dashboardService.findDashboardsByTenantId(tenantId, pageLink);
+            loadedDashboardsTitle2.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(dashboardsTitle2, idComparator);
+        Collections.sort(loadedDashboardsTitle2, idComparator);
+        
+        Assert.assertEquals(dashboardsTitle2, loadedDashboardsTitle2);
+
+        for (Dashboard dashboard : loadedDashboardsTitle1) {
+            dashboardService.deleteDashboard(dashboard.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title1);
+        pageData = dashboardService.findDashboardsByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        for (Dashboard dashboard : loadedDashboardsTitle2) {
+            dashboardService.deleteDashboard(dashboard.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title2);
+        pageData = dashboardService.findDashboardsByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+    }
+    
+    @Test
+    public void testFindDashboardsByTenantIdAndCustomerId() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        Customer customer = new Customer();
+        customer.setTitle("Test customer");
+        customer.setTenantId(tenantId);
+        customer = customerService.saveCustomer(customer);
+        CustomerId customerId = customer.getId();
+        
+        List<Dashboard> dashboards = new ArrayList<>();
+        for (int i=0;i<223;i++) {
+            Dashboard dashboard = new Dashboard();
+            dashboard.setTenantId(tenantId);
+            dashboard.setTitle("Dashboard"+i);
+            dashboard = dashboardService.saveDashboard(dashboard);
+            dashboards.add(dashboardService.assignDashboardToCustomer(dashboard.getId(), customerId));
+        }
+        
+        List<Dashboard> loadedDashboards = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(23);
+        TextPageData<Dashboard> pageData = null;
+        do {
+            pageData = dashboardService.findDashboardsByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+            loadedDashboards.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(dashboards, idComparator);
+        Collections.sort(loadedDashboards, idComparator);
+        
+        Assert.assertEquals(dashboards, loadedDashboards);
+        
+        dashboardService.unassignCustomerDashboards(tenantId, customerId);
+
+        pageLink = new TextPageLink(42);
+        pageData = dashboardService.findDashboardsByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        
+        tenantService.deleteTenant(tenantId);
+    }
+    
+    @Test
+    public void testFindDashboardsByTenantIdCustomerIdAndTitle() {
+        
+        Customer customer = new Customer();
+        customer.setTitle("Test customer");
+        customer.setTenantId(tenantId);
+        customer = customerService.saveCustomer(customer);
+        CustomerId customerId = customer.getId();
+        
+        String title1 = "Dashboard title 1";
+        List<Dashboard> dashboardsTitle1 = new ArrayList<>();
+        for (int i=0;i<124;i++) {
+            Dashboard dashboard = new Dashboard();
+            dashboard.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(Math.random()*15));
+            String title = title1+suffix;
+            title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
+            dashboard.setTitle(title);
+            dashboard = dashboardService.saveDashboard(dashboard);
+            dashboardsTitle1.add(dashboardService.assignDashboardToCustomer(dashboard.getId(), customerId));
+        }
+        String title2 = "Dashboard title 2";
+        List<Dashboard> dashboardsTitle2 = new ArrayList<>();
+        for (int i=0;i<151;i++) {
+            Dashboard dashboard = new Dashboard();
+            dashboard.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(Math.random()*15));
+            String title = title2+suffix;
+            title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
+            dashboard.setTitle(title);
+            dashboard = dashboardService.saveDashboard(dashboard);
+            dashboardsTitle2.add(dashboardService.assignDashboardToCustomer(dashboard.getId(), customerId));
+        }
+        
+        List<Dashboard> loadedDashboardsTitle1 = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(24, title1);
+        TextPageData<Dashboard> pageData = null;
+        do {
+            pageData = dashboardService.findDashboardsByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+            loadedDashboardsTitle1.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(dashboardsTitle1, idComparator);
+        Collections.sort(loadedDashboardsTitle1, idComparator);
+        
+        Assert.assertEquals(dashboardsTitle1, loadedDashboardsTitle1);
+        
+        List<Dashboard> loadedDashboardsTitle2 = new ArrayList<>();
+        pageLink = new TextPageLink(4, title2);
+        do {
+            pageData = dashboardService.findDashboardsByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+            loadedDashboardsTitle2.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(dashboardsTitle2, idComparator);
+        Collections.sort(loadedDashboardsTitle2, idComparator);
+        
+        Assert.assertEquals(dashboardsTitle2, loadedDashboardsTitle2);
+
+        for (Dashboard dashboard : loadedDashboardsTitle1) {
+            dashboardService.deleteDashboard(dashboard.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title1);
+        pageData = dashboardService.findDashboardsByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        for (Dashboard dashboard : loadedDashboardsTitle2) {
+            dashboardService.deleteDashboard(dashboard.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title2);
+        pageData = dashboardService.findDashboardsByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        customerService.deleteCustomer(customerId);
+    }
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java
new file mode 100644
index 0000000..fd71fa4
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsCacheTest.java
@@ -0,0 +1,163 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.hazelcast.core.HazelcastInstance;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.aop.framework.Advised;
+import org.springframework.aop.support.AopUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.util.ReflectionTestUtils;
+import org.thingsboard.server.common.data.CacheConstants;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.id.DeviceCredentialsId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.dao.device.DeviceCredentialsDao;
+import org.thingsboard.server.dao.device.DeviceCredentialsService;
+import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.model.DeviceCredentialsEntity;
+
+import java.util.UUID;
+
+import static org.mockito.Mockito.*;
+
+@TestPropertySource(properties = {"cache.enabled = true"})
+public class DeviceCredentialsCacheTest extends AbstractServiceTest {
+
+    private static final String CREDENTIALS_ID_1 = RandomStringUtils.randomAlphanumeric(20);
+    private static final String CREDENTIALS_ID_2 = RandomStringUtils.randomAlphanumeric(20);
+
+    @Autowired
+    private DeviceCredentialsService deviceCredentialsService;
+
+    private DeviceCredentialsDao deviceCredentialsDao;
+    private DeviceService deviceService;
+
+    @Autowired
+    private HazelcastInstance hazelcastInstance;
+
+    private UUID deviceId = UUIDs.timeBased();
+
+    @Before
+    public void setup() throws Exception {
+        deviceCredentialsDao = mock(DeviceCredentialsDao.class);
+        deviceService = mock(DeviceService.class);
+        ReflectionTestUtils.setField(unwrapDeviceCredentialsService(), "deviceCredentialsDao", deviceCredentialsDao);
+        ReflectionTestUtils.setField(unwrapDeviceCredentialsService(), "deviceService", deviceService);
+    }
+
+    @After
+    public void cleanup() {
+        hazelcastInstance.getMap(CacheConstants.DEVICE_CREDENTIALS_CACHE).evictAll();
+    }
+
+    @Test
+    public void testFindDeviceCredentialsByCredentialsId_Cached() {
+        when(deviceCredentialsDao.findByCredentialsId(CREDENTIALS_ID_1)).thenReturn(createDummyDeviceCredentialsEntity(CREDENTIALS_ID_1));
+
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+
+        Assert.assertEquals(1, hazelcastInstance.getMap(CacheConstants.DEVICE_CREDENTIALS_CACHE).size());
+        verify(deviceCredentialsDao, times(1)).findByCredentialsId(CREDENTIALS_ID_1);
+    }
+
+    @Test
+    public void testDeleteDeviceCredentials_EvictsCache() {
+        when(deviceCredentialsDao.findByCredentialsId(CREDENTIALS_ID_1)).thenReturn(createDummyDeviceCredentialsEntity(CREDENTIALS_ID_1));
+
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+
+        Assert.assertEquals(1, hazelcastInstance.getMap(CacheConstants.DEVICE_CREDENTIALS_CACHE).size());
+        verify(deviceCredentialsDao, times(1)).findByCredentialsId(CREDENTIALS_ID_1);
+
+        deviceCredentialsService.deleteDeviceCredentials(createDummyDeviceCredentials(CREDENTIALS_ID_1, deviceId));
+
+        Assert.assertEquals(0, hazelcastInstance.getMap(CacheConstants.DEVICE_CREDENTIALS_CACHE).size());
+
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+
+        Assert.assertEquals(1, hazelcastInstance.getMap(CacheConstants.DEVICE_CREDENTIALS_CACHE).size());
+        verify(deviceCredentialsDao, times(2)).findByCredentialsId(CREDENTIALS_ID_1);
+    }
+
+    @Test
+    public void testSaveDeviceCredentials_EvictsPreviousCache() throws Exception {
+        when(deviceCredentialsDao.findByCredentialsId(CREDENTIALS_ID_1)).thenReturn(createDummyDeviceCredentialsEntity(CREDENTIALS_ID_1));
+
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+
+        Assert.assertEquals(1, hazelcastInstance.getMap(CacheConstants.DEVICE_CREDENTIALS_CACHE).size());
+        verify(deviceCredentialsDao, times(1)).findByCredentialsId(CREDENTIALS_ID_1);
+
+        when(deviceCredentialsDao.findByDeviceId(deviceId)).thenReturn(createDummyDeviceCredentialsEntity(CREDENTIALS_ID_1));
+
+        UUID deviceCredentialsId = UUIDs.timeBased();
+        when(deviceCredentialsDao.findById(deviceCredentialsId)).thenReturn(createDummyDeviceCredentialsEntity(CREDENTIALS_ID_1));
+        when(deviceService.findDeviceById(new DeviceId(deviceId))).thenReturn(new Device());
+
+        deviceCredentialsService.updateDeviceCredentials(createDummyDeviceCredentials(deviceCredentialsId, CREDENTIALS_ID_2, deviceId));
+        Assert.assertEquals(0, hazelcastInstance.getMap(CacheConstants.DEVICE_CREDENTIALS_CACHE).size());
+
+        when(deviceCredentialsDao.findByCredentialsId(CREDENTIALS_ID_1)).thenReturn(null);
+
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+        deviceCredentialsService.findDeviceCredentialsByCredentialsId(CREDENTIALS_ID_1);
+        Assert.assertEquals(0, hazelcastInstance.getMap(CacheConstants.DEVICE_CREDENTIALS_CACHE).size());
+
+        verify(deviceCredentialsDao, times(3)).findByCredentialsId(CREDENTIALS_ID_1);
+    }
+
+    private DeviceCredentialsService unwrapDeviceCredentialsService() throws Exception {
+        if (AopUtils.isAopProxy(deviceCredentialsService) && deviceCredentialsService instanceof Advised) {
+            Object target = ((Advised) deviceCredentialsService).getTargetSource().getTarget();
+            return (DeviceCredentialsService) target;
+        }
+        return null;
+    }
+
+    private DeviceCredentialsEntity createDummyDeviceCredentialsEntity(String deviceCredentialsId) {
+        DeviceCredentialsEntity result = new DeviceCredentialsEntity();
+        result.setId(UUIDs.timeBased());
+        result.setCredentialsId(deviceCredentialsId);
+        return result;
+    }
+
+    private DeviceCredentials createDummyDeviceCredentials(String deviceCredentialsId, UUID deviceId) {
+        return createDummyDeviceCredentials(null, deviceCredentialsId, deviceId);
+    }
+
+    private DeviceCredentials createDummyDeviceCredentials(UUID id, String deviceCredentialsId, UUID deviceId) {
+        DeviceCredentials result = new DeviceCredentials();
+        result.setId(new DeviceCredentialsId(id));
+        result.setDeviceId(new DeviceId(deviceId));
+        result.setCredentialsId(deviceCredentialsId);
+        result.setCredentialsType(DeviceCredentialsType.ACCESS_TOKEN);
+        return result;
+    }
+}
+

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java
new file mode 100644
index 0000000..d7dd552
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceCredentialsServiceImplTest.java
@@ -0,0 +1,195 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import com.datastax.driver.core.utils.UUIDs;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.DeviceCredentialsId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.dao.exception.DataValidationException;
+
+public class DeviceCredentialsServiceImplTest extends AbstractServiceTest {
+
+    private TenantId tenantId;
+
+    @Before
+    public void before() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        tenantId = savedTenant.getId();
+    }
+
+    @After
+    public void after() {
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testCreateDeviceCredentials() {
+        DeviceCredentials deviceCredentials = new DeviceCredentials();
+        deviceCredentialsService.updateDeviceCredentials(deviceCredentials);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveDeviceCredentialsWithEmptyDevice() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(tenantId);
+        device = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getId());
+        deviceCredentials.setDeviceId(null);
+        try {
+            deviceCredentialsService.updateDeviceCredentials(deviceCredentials);
+        } finally {
+            deviceService.deleteDevice(device.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveDeviceCredentialsWithEmptyCredentialsType() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(tenantId);
+        device = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getId());
+        deviceCredentials.setCredentialsType(null);
+        try {
+            deviceCredentialsService.updateDeviceCredentials(deviceCredentials);
+        } finally {
+            deviceService.deleteDevice(device.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveDeviceCredentialsWithEmptyCredentialsId() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(tenantId);
+        device = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getId());
+        deviceCredentials.setCredentialsId(null);
+        try {
+            deviceCredentialsService.updateDeviceCredentials(deviceCredentials);
+        } finally {
+            deviceService.deleteDevice(device.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveNonExistentDeviceCredentials() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(tenantId);
+        device = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getId());
+        DeviceCredentials newDeviceCredentials = new DeviceCredentials(new DeviceCredentialsId(UUIDs.timeBased()));
+        newDeviceCredentials.setCreatedTime(deviceCredentials.getCreatedTime());
+        newDeviceCredentials.setDeviceId(deviceCredentials.getDeviceId());
+        newDeviceCredentials.setCredentialsType(deviceCredentials.getCredentialsType());
+        newDeviceCredentials.setCredentialsId(deviceCredentials.getCredentialsId());
+        try {
+            deviceCredentialsService.updateDeviceCredentials(newDeviceCredentials);
+        } finally {
+            deviceService.deleteDevice(device.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveDeviceCredentialsWithNonExistentDevice() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(tenantId);
+        device = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getId());
+        deviceCredentials.setDeviceId(new DeviceId(UUIDs.timeBased()));
+        try {
+            deviceCredentialsService.updateDeviceCredentials(deviceCredentials);
+        } finally {
+            deviceService.deleteDevice(device.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveDeviceCredentialsWithInvalidCredemtialsIdLength() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(tenantId);
+        device = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(device.getId());
+        deviceCredentials.setCredentialsId(RandomStringUtils.randomAlphanumeric(21));
+        try {
+            deviceCredentialsService.updateDeviceCredentials(deviceCredentials);
+        } finally {
+            deviceService.deleteDevice(device.getId());
+        }
+    }
+
+    @Test
+    public void testFindDeviceCredentialsByDeviceId() {
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        device.setName("My device");
+        Device savedDevice = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedDevice.getId());
+        Assert.assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId());
+        deviceService.deleteDevice(savedDevice.getId());
+        deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedDevice.getId());
+        Assert.assertNull(deviceCredentials);
+    }
+
+    @Test
+    public void testFindDeviceCredentialsByCredentialsId() {
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        device.setName("My device");
+        Device savedDevice = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedDevice.getId());
+        Assert.assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId());
+        DeviceCredentials foundDeviceCredentials = deviceCredentialsService.findDeviceCredentialsByCredentialsId(deviceCredentials.getCredentialsId());
+        Assert.assertEquals(deviceCredentials, foundDeviceCredentials);
+        deviceService.deleteDevice(savedDevice.getId());
+        foundDeviceCredentials = deviceCredentialsService.findDeviceCredentialsByCredentialsId(deviceCredentials.getCredentialsId());
+        Assert.assertNull(foundDeviceCredentials);
+    }
+
+    @Test
+    public void testSaveDeviceCredentials() {
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        device.setName("My device");
+        Device savedDevice = deviceService.saveDevice(device);
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedDevice.getId());
+        Assert.assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId());
+        deviceCredentials.setCredentialsType(DeviceCredentialsType.ACCESS_TOKEN);
+        deviceCredentials.setCredentialsId("access_token");
+        deviceCredentialsService.updateDeviceCredentials(deviceCredentials);
+        DeviceCredentials foundDeviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedDevice.getId());
+        Assert.assertEquals(deviceCredentials, foundDeviceCredentials);
+        deviceService.deleteDevice(savedDevice.getId());
+    }
+}
+

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java
new file mode 100644
index 0000000..f4eb22b
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/DeviceServiceImplTest.java
@@ -0,0 +1,428 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import com.datastax.driver.core.utils.UUIDs;
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.DeviceCredentialsId;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.DeviceCredentials;
+import org.thingsboard.server.common.data.security.DeviceCredentialsType;
+import org.thingsboard.server.dao.exception.DataValidationException;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
+
+public class DeviceServiceImplTest extends AbstractServiceTest {
+    
+    private IdComparator<Device> idComparator = new IdComparator<>();
+    
+    private TenantId tenantId;
+
+    @Before
+    public void before() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        tenantId = savedTenant.getId();
+    }
+
+    @After
+    public void after() {
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test
+    public void testSaveDevice() {
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        device.setName("My device");
+        Device savedDevice = deviceService.saveDevice(device);
+        
+        Assert.assertNotNull(savedDevice);
+        Assert.assertNotNull(savedDevice.getId());
+        Assert.assertTrue(savedDevice.getCreatedTime() > 0);
+        Assert.assertEquals(device.getTenantId(), savedDevice.getTenantId());
+        Assert.assertNotNull(savedDevice.getCustomerId());
+        Assert.assertEquals(NULL_UUID, savedDevice.getCustomerId().getId());
+        Assert.assertEquals(device.getName(), savedDevice.getName());
+        
+        DeviceCredentials deviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedDevice.getId());
+        Assert.assertNotNull(deviceCredentials);
+        Assert.assertNotNull(deviceCredentials.getId());
+        Assert.assertEquals(savedDevice.getId(), deviceCredentials.getDeviceId());
+        Assert.assertEquals(DeviceCredentialsType.ACCESS_TOKEN, deviceCredentials.getCredentialsType());
+        Assert.assertNotNull(deviceCredentials.getCredentialsId());
+        Assert.assertEquals(20, deviceCredentials.getCredentialsId().length());
+        
+        savedDevice.setName("My new device");
+        
+        deviceService.saveDevice(savedDevice);
+        Device foundDevice = deviceService.findDeviceById(savedDevice.getId());
+        Assert.assertEquals(foundDevice.getName(), savedDevice.getName());
+        
+        deviceService.deleteDevice(savedDevice.getId());
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveDeviceWithEmptyName() {
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        deviceService.saveDevice(device);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveDeviceWithEmptyTenant() {
+        Device device = new Device();
+        device.setName("My device");
+        deviceService.saveDevice(device);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveDeviceWithInvalidTenant() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(new TenantId(UUIDs.timeBased()));
+        deviceService.saveDevice(device);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testAssignDeviceToNonExistentCustomer() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(tenantId);
+        device = deviceService.saveDevice(device);
+        try {
+            deviceService.assignDeviceToCustomer(device.getId(), new CustomerId(UUIDs.timeBased()));
+        } finally {
+            deviceService.deleteDevice(device.getId());
+        }
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testAssignDeviceToCustomerFromDifferentTenant() {
+        Device device = new Device();
+        device.setName("My device");
+        device.setTenantId(tenantId);
+        device = deviceService.saveDevice(device);
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test different tenant");
+        tenant = tenantService.saveTenant(tenant);
+        Customer customer = new Customer();
+        customer.setTenantId(tenant.getId());
+        customer.setTitle("Test different customer");
+        customer = customerService.saveCustomer(customer);
+        try {
+            deviceService.assignDeviceToCustomer(device.getId(), customer.getId());
+        } finally {
+            deviceService.deleteDevice(device.getId());
+            tenantService.deleteTenant(tenant.getId());
+        }
+    }
+    
+    @Test
+    public void testFindDeviceById() {
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        device.setName("My device");
+        Device savedDevice = deviceService.saveDevice(device);
+        Device foundDevice = deviceService.findDeviceById(savedDevice.getId());
+        Assert.assertNotNull(foundDevice);
+        Assert.assertEquals(savedDevice, foundDevice);
+        deviceService.deleteDevice(savedDevice.getId());
+    }
+    
+    @Test
+    public void testDeleteDevice() {
+        Device device = new Device();
+        device.setTenantId(tenantId);
+        device.setName("My device");
+        Device savedDevice = deviceService.saveDevice(device);
+        Device foundDevice = deviceService.findDeviceById(savedDevice.getId());
+        Assert.assertNotNull(foundDevice);
+        deviceService.deleteDevice(savedDevice.getId());
+        foundDevice = deviceService.findDeviceById(savedDevice.getId());
+        Assert.assertNull(foundDevice);
+        DeviceCredentials foundDeviceCredentials = deviceCredentialsService.findDeviceCredentialsByDeviceId(savedDevice.getId());
+        Assert.assertNull(foundDeviceCredentials);
+    }
+    
+    @Test
+    public void testFindDevicesByTenantId() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        List<Device> devices = new ArrayList<>();
+        for (int i=0;i<178;i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            device.setName("Device"+i);
+            devices.add(deviceService.saveDevice(device));
+        }
+        
+        List<Device> loadedDevices = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(23);
+        TextPageData<Device> pageData = null;
+        do {
+            pageData = deviceService.findDevicesByTenantId(tenantId, pageLink);
+            loadedDevices.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(devices, idComparator);
+        Collections.sort(loadedDevices, idComparator);
+        
+        Assert.assertEquals(devices, loadedDevices);
+        
+        deviceService.deleteDevicesByTenantId(tenantId);
+
+        pageLink = new TextPageLink(33);
+        pageData = deviceService.findDevicesByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        
+        tenantService.deleteTenant(tenantId);
+    }
+    
+    @Test
+    public void testFindDevicesByTenantIdAndName() {
+        String title1 = "Device title 1";
+        List<Device> devicesTitle1 = new ArrayList<>();
+        for (int i=0;i<143;i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric(15);
+            String name = title1+suffix;
+            name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
+            device.setName(name);
+            devicesTitle1.add(deviceService.saveDevice(device));
+        }
+        String title2 = "Device title 2";
+        List<Device> devicesTitle2 = new ArrayList<>();
+        for (int i=0;i<175;i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric(15);
+            String name = title2+suffix;
+            name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
+            device.setName(name);
+            devicesTitle2.add(deviceService.saveDevice(device));
+        }
+        
+        List<Device> loadedDevicesTitle1 = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(15, title1);
+        TextPageData<Device> pageData = null;
+        do {
+            pageData = deviceService.findDevicesByTenantId(tenantId, pageLink);
+            loadedDevicesTitle1.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(devicesTitle1, idComparator);
+        Collections.sort(loadedDevicesTitle1, idComparator);
+        
+        Assert.assertEquals(devicesTitle1, loadedDevicesTitle1);
+        
+        List<Device> loadedDevicesTitle2 = new ArrayList<>();
+        pageLink = new TextPageLink(4, title2);
+        do {
+            pageData = deviceService.findDevicesByTenantId(tenantId, pageLink);
+            loadedDevicesTitle2.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(devicesTitle2, idComparator);
+        Collections.sort(loadedDevicesTitle2, idComparator);
+        
+        Assert.assertEquals(devicesTitle2, loadedDevicesTitle2);
+
+        for (Device device : loadedDevicesTitle1) {
+            deviceService.deleteDevice(device.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title1);
+        pageData = deviceService.findDevicesByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        for (Device device : loadedDevicesTitle2) {
+            deviceService.deleteDevice(device.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title2);
+        pageData = deviceService.findDevicesByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+    }
+    
+    @Test
+    public void testFindDevicesByTenantIdAndCustomerId() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        Customer customer = new Customer();
+        customer.setTitle("Test customer");
+        customer.setTenantId(tenantId);
+        customer = customerService.saveCustomer(customer);
+        CustomerId customerId = customer.getId();
+        
+        List<Device> devices = new ArrayList<>();
+        for (int i=0;i<278;i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            device.setName("Device"+i);
+            device = deviceService.saveDevice(device);
+            devices.add(deviceService.assignDeviceToCustomer(device.getId(), customerId));
+        }
+        
+        List<Device> loadedDevices = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(23);
+        TextPageData<Device> pageData = null;
+        do {
+            pageData = deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+            loadedDevices.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(devices, idComparator);
+        Collections.sort(loadedDevices, idComparator);
+        
+        Assert.assertEquals(devices, loadedDevices);
+        
+        deviceService.unassignCustomerDevices(tenantId, customerId);
+
+        pageLink = new TextPageLink(33);
+        pageData = deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        
+        tenantService.deleteTenant(tenantId);
+    }
+    
+    @Test
+    public void testFindDevicesByTenantIdCustomerIdAndName() {
+        
+        Customer customer = new Customer();
+        customer.setTitle("Test customer");
+        customer.setTenantId(tenantId);
+        customer = customerService.saveCustomer(customer);
+        CustomerId customerId = customer.getId();
+        
+        String title1 = "Device title 1";
+        List<Device> devicesTitle1 = new ArrayList<>();
+        for (int i=0;i<175;i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric(15);
+            String name = title1+suffix;
+            name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
+            device.setName(name);
+            device = deviceService.saveDevice(device);
+            devicesTitle1.add(deviceService.assignDeviceToCustomer(device.getId(), customerId));
+        }
+        String title2 = "Device title 2";
+        List<Device> devicesTitle2 = new ArrayList<>();
+        for (int i=0;i<143;i++) {
+            Device device = new Device();
+            device.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric(15);
+            String name = title2+suffix;
+            name = i % 2 == 0 ? name.toLowerCase() : name.toUpperCase();
+            device.setName(name);
+            device = deviceService.saveDevice(device);
+            devicesTitle2.add(deviceService.assignDeviceToCustomer(device.getId(), customerId));
+        }
+        
+        List<Device> loadedDevicesTitle1 = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(15, title1);
+        TextPageData<Device> pageData = null;
+        do {
+            pageData = deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+            loadedDevicesTitle1.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(devicesTitle1, idComparator);
+        Collections.sort(loadedDevicesTitle1, idComparator);
+        
+        Assert.assertEquals(devicesTitle1, loadedDevicesTitle1);
+        
+        List<Device> loadedDevicesTitle2 = new ArrayList<>();
+        pageLink = new TextPageLink(4, title2);
+        do {
+            pageData = deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+            loadedDevicesTitle2.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(devicesTitle2, idComparator);
+        Collections.sort(loadedDevicesTitle2, idComparator);
+        
+        Assert.assertEquals(devicesTitle2, loadedDevicesTitle2);
+
+        for (Device device : loadedDevicesTitle1) {
+            deviceService.deleteDevice(device.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title1);
+        pageData = deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        for (Device device : loadedDevicesTitle2) {
+            deviceService.deleteDevice(device.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title2);
+        pageData = deviceService.findDevicesByTenantIdAndCustomerId(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        customerService.deleteCustomer(customerId);
+    }
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceImplTest.java
new file mode 100644
index 0000000..074afe5
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/TenantServiceImplTest.java
@@ -0,0 +1,203 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TenantServiceImplTest extends AbstractServiceTest {
+    
+    private IdComparator<Tenant> idComparator = new IdComparator<>();
+
+    @Test
+    public void testSaveTenant() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        Assert.assertNotNull(savedTenant.getId());
+        Assert.assertTrue(savedTenant.getCreatedTime() > 0);
+        Assert.assertEquals(tenant.getTitle(), savedTenant.getTitle());
+        
+        savedTenant.setTitle("My new tenant");
+        tenantService.saveTenant(savedTenant);
+        Tenant foundTenant = tenantService.findTenantById(savedTenant.getId());
+        Assert.assertEquals(foundTenant.getTitle(), savedTenant.getTitle());
+        
+        tenantService.deleteTenant(savedTenant.getId());
+    }
+    
+    @Test
+    public void testFindTenantById() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Tenant foundTenant = tenantService.findTenantById(savedTenant.getId());
+        Assert.assertNotNull(foundTenant);
+        Assert.assertEquals(savedTenant, foundTenant);
+        tenantService.deleteTenant(savedTenant.getId());
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveTenantWithEmptyTitle() {
+        Tenant tenant = new Tenant();
+        tenantService.saveTenant(tenant);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveTenantWithInvalidEmail() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        tenant.setEmail("invalid@mail");
+        tenantService.saveTenant(tenant);
+    }
+    
+    @Test
+    public void testDeleteTenant() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        tenantService.deleteTenant(savedTenant.getId());
+        Tenant foundTenant = tenantService.findTenantById(savedTenant.getId());
+        Assert.assertNull(foundTenant);
+    }
+    
+    @Test
+    public void testFindTenants() {
+        
+        List<Tenant> tenants = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(17);
+        TextPageData<Tenant> pageData = tenantService.findTenants(pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        tenants.addAll(pageData.getData());
+        
+        for (int i=0;i<156;i++) {
+            Tenant tenant = new Tenant();
+            tenant.setTitle("Tenant"+i);
+            tenants.add(tenantService.saveTenant(tenant));
+        }
+        
+        List<Tenant> loadedTenants = new ArrayList<>();
+        pageLink = new TextPageLink(17);
+        do {
+            pageData = tenantService.findTenants(pageLink);
+            loadedTenants.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(tenants, idComparator);
+        Collections.sort(loadedTenants, idComparator);
+        
+        Assert.assertEquals(tenants, loadedTenants);
+        
+        for (Tenant tenant : loadedTenants) {
+            if (!tenant.getTitle().equals("Tenant")) {
+                tenantService.deleteTenant(tenant.getId());
+            }
+        }
+        
+        pageLink = new TextPageLink(17);
+        pageData = tenantService.findTenants(pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        
+    }
+    
+    @Test
+    public void testFindTenantsByTitle() {
+        String title1 = "Tenant title 1";
+        List<Tenant> tenantsTitle1 = new ArrayList<>();
+        for (int i=0;i<134;i++) {
+            Tenant tenant = new Tenant();
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(Math.random()*15));
+            String title = title1+suffix;
+            title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
+            tenant.setTitle(title);
+            tenantsTitle1.add(tenantService.saveTenant(tenant));
+        }
+        String title2 = "Tenant title 2";
+        List<Tenant> tenantsTitle2 = new ArrayList<>();
+        for (int i=0;i<127;i++) {
+            Tenant tenant = new Tenant();
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(Math.random()*15));
+            String title = title2+suffix;
+            title = i % 2 == 0 ? title.toLowerCase() : title.toUpperCase();
+            tenant.setTitle(title);
+            tenantsTitle2.add(tenantService.saveTenant(tenant));
+        }
+        
+        List<Tenant> loadedTenantsTitle1 = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(15, title1);
+        TextPageData<Tenant> pageData = null;
+        do {
+            pageData = tenantService.findTenants(pageLink);
+            loadedTenantsTitle1.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(tenantsTitle1, idComparator);
+        Collections.sort(loadedTenantsTitle1, idComparator);
+        
+        Assert.assertEquals(tenantsTitle1, loadedTenantsTitle1);
+        
+        List<Tenant> loadedTenantsTitle2 = new ArrayList<>();
+        pageLink = new TextPageLink(4, title2);
+        do {
+            pageData = tenantService.findTenants(pageLink);
+            loadedTenantsTitle2.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(tenantsTitle2, idComparator);
+        Collections.sort(loadedTenantsTitle2, idComparator);
+        
+        Assert.assertEquals(tenantsTitle2, loadedTenantsTitle2);
+
+        for (Tenant tenant : loadedTenantsTitle1) {
+            tenantService.deleteTenant(tenant.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title1);
+        pageData = tenantService.findTenants(pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        for (Tenant tenant : loadedTenantsTitle2) {
+            tenantService.deleteTenant(tenant.getId());
+        }
+        
+        pageLink = new TextPageLink(4, title2);
+        pageData = tenantService.findTenants(pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+    }
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java
new file mode 100644
index 0000000..6b2f37c
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/UserServiceImplTest.java
@@ -0,0 +1,477 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.lang3.RandomStringUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.CustomerId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.security.Authority;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class UserServiceImplTest extends AbstractServiceTest {
+    
+    private IdComparator<User> idComparator = new IdComparator<>();
+
+    private TenantId tenantId;
+
+    @Before
+    public void before() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        tenantId = savedTenant.getId();
+
+        User tenantAdmin = new User();
+        tenantAdmin.setAuthority(Authority.TENANT_ADMIN);
+        tenantAdmin.setTenantId(tenantId);
+        tenantAdmin.setEmail("tenant@thingsboard.org");
+        userService.saveUser(tenantAdmin);
+
+        Customer customer = new Customer();
+        customer.setTenantId(tenantId);
+        customer.setTitle("My customer");
+        Customer savedCustomer = customerService.saveCustomer(customer);
+
+        User customerUser = new User();
+        customerUser.setAuthority(Authority.CUSTOMER_USER);
+        customerUser.setTenantId(tenantId);
+        customerUser.setCustomerId(savedCustomer.getId());
+        customerUser.setEmail("customer@thingsboard.org");
+        userService.saveUser(customerUser);
+    }
+
+    @After
+    public void after() {
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test
+    public void testFindUserByEmail() {
+        User user = userService.findUserByEmail("sysadmin@thingsboard.org");
+        Assert.assertNotNull(user);
+        Assert.assertEquals(Authority.SYS_ADMIN, user.getAuthority());
+        user = userService.findUserByEmail("tenant@thingsboard.org");
+        Assert.assertNotNull(user);
+        Assert.assertEquals(Authority.TENANT_ADMIN, user.getAuthority());
+        user = userService.findUserByEmail("customer@thingsboard.org");
+        Assert.assertNotNull(user);
+        Assert.assertEquals(Authority.CUSTOMER_USER, user.getAuthority());
+        user = userService.findUserByEmail("fake@thingsboard.org");
+        Assert.assertNull(user);
+    }
+
+    @Test
+    public void testFindUserById() {
+        User user = userService.findUserByEmail("sysadmin@thingsboard.org");
+        Assert.assertNotNull(user);
+        User foundUser = userService.findUserById(user.getId());
+        Assert.assertNotNull(foundUser);
+        Assert.assertEquals(user, foundUser);
+    }
+    
+    @Test
+    public void testFindUserCredentials() {
+        User user = userService.findUserByEmail("sysadmin@thingsboard.org");
+        Assert.assertNotNull(user);
+        UserCredentials userCredentials = userService.findUserCredentialsByUserId(user.getId());
+        Assert.assertNotNull(userCredentials);
+    }
+    
+    @Test
+    public void testSaveUser() {
+        User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org");
+        User user = new User();
+        user.setAuthority(Authority.TENANT_ADMIN);
+        user.setTenantId(tenantAdminUser.getTenantId());
+        user.setEmail("tenant2@thingsboard.org");
+        User savedUser = userService.saveUser(user);
+        Assert.assertNotNull(savedUser);
+        Assert.assertNotNull(savedUser.getId());
+        Assert.assertTrue(savedUser.getCreatedTime() > 0);
+        Assert.assertEquals(user.getEmail(), savedUser.getEmail());
+        Assert.assertEquals(user.getTenantId(), savedUser.getTenantId());
+        Assert.assertEquals(user.getAuthority(), savedUser.getAuthority());
+        UserCredentials userCredentials = userService.findUserCredentialsByUserId(savedUser.getId());
+        Assert.assertNotNull(userCredentials);
+        Assert.assertNotNull(userCredentials.getId());
+        Assert.assertNotNull(userCredentials.getUserId());
+        Assert.assertNotNull(userCredentials.getActivateToken());
+        
+        savedUser.setFirstName("Joe");
+        savedUser.setLastName("Downs");
+        
+        userService.saveUser(savedUser);
+        savedUser = userService.findUserById(savedUser.getId());
+        Assert.assertEquals("Joe", savedUser.getFirstName());
+        Assert.assertEquals("Downs", savedUser.getLastName());        
+        
+        userService.deleteUser(savedUser.getId());
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveUserWithSameEmail() {
+        User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org");
+        tenantAdminUser.setEmail("sysadmin@thingsboard.org");
+        userService.saveUser(tenantAdminUser);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveUserWithInvalidEmail() {
+        User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org");
+        tenantAdminUser.setEmail("tenant_thingsboard.org");
+        userService.saveUser(tenantAdminUser);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveUserWithEmptyEmail() {
+        User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org");
+        tenantAdminUser.setEmail(null);
+        userService.saveUser(tenantAdminUser);
+    }
+    
+    @Test(expected = DataValidationException.class)
+    public void testSaveUserWithoutTenant() {
+        User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org");
+        tenantAdminUser.setTenantId(null);
+        userService.saveUser(tenantAdminUser);
+    }
+    
+    @Test
+    public void testDeleteUser() {
+        User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org");
+        User user = new User();
+        user.setAuthority(Authority.TENANT_ADMIN);
+        user.setTenantId(tenantAdminUser.getTenantId());
+        user.setEmail("tenant2@thingsboard.org");
+        User savedUser = userService.saveUser(user);
+        Assert.assertNotNull(savedUser);
+        Assert.assertNotNull(savedUser.getId());
+        User foundUser = userService.findUserById(savedUser.getId());
+        Assert.assertNotNull(foundUser);
+        UserCredentials userCredentials = userService.findUserCredentialsByUserId(foundUser.getId());
+        Assert.assertNotNull(userCredentials);
+        userService.deleteUser(foundUser.getId());
+        userCredentials = userService.findUserCredentialsByUserId(foundUser.getId());
+        foundUser = userService.findUserById(foundUser.getId());
+        Assert.assertNull(foundUser);
+        Assert.assertNull(userCredentials);
+    }
+    
+    @Test
+    public void testFindTenantAdmins() {
+        User tenantAdminUser = userService.findUserByEmail("tenant@thingsboard.org");
+        TextPageData<User> pageData = userService.findTenantAdmins(tenantAdminUser.getTenantId(), new TextPageLink(10));
+        Assert.assertFalse(pageData.hasNext());
+        List<User> users = pageData.getData();
+        Assert.assertEquals(1, users.size());
+        Assert.assertEquals(tenantAdminUser, users.get(0));
+        
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        List<User> tenantAdmins = new ArrayList<>();
+        for (int i=0;i<124;i++) {
+            User user = new User();
+            user.setAuthority(Authority.TENANT_ADMIN);
+            user.setTenantId(tenantId);
+            user.setEmail("testTenant" + i + "@thingsboard.org");
+            tenantAdmins.add(userService.saveUser(user));
+        }
+        
+        List<User> loadedTenantAdmins = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(33);
+        do {
+            pageData = userService.findTenantAdmins(tenantId, pageLink);
+            loadedTenantAdmins.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(tenantAdmins, idComparator);
+        Collections.sort(loadedTenantAdmins, idComparator);
+        
+        Assert.assertEquals(tenantAdmins, loadedTenantAdmins);
+        
+        tenantService.deleteTenant(tenantId);
+        
+        pageLink = new TextPageLink(33);
+        pageData = userService.findTenantAdmins(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        
+    }
+    
+    @Test
+    public void testFindTenantAdminsByEmail() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        String email1 = "testEmail1";        
+        List<User> tenantAdminsEmail1 = new ArrayList<>();
+        
+        for (int i=0;i<94;i++) {
+            User user = new User();
+            user.setAuthority(Authority.TENANT_ADMIN);
+            user.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(5 + Math.random()*10));
+            String email = email1+suffix+ "@thingsboard.org";
+            email = i % 2 == 0 ? email.toLowerCase() : email.toUpperCase();
+            user.setEmail(email);
+            tenantAdminsEmail1.add(userService.saveUser(user));
+        }
+        
+        String email2 = "testEmail2";        
+        List<User> tenantAdminsEmail2 = new ArrayList<>();
+        
+        for (int i=0;i<132;i++) {
+            User user = new User();
+            user.setAuthority(Authority.TENANT_ADMIN);
+            user.setTenantId(tenantId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(5 + Math.random()*10));
+            String email = email2+suffix+ "@thingsboard.org";
+            email = i % 2 == 0 ? email.toLowerCase() : email.toUpperCase();
+            user.setEmail(email);
+            tenantAdminsEmail2.add(userService.saveUser(user));
+        }
+        
+        List<User> loadedTenantAdminsEmail1 = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(33, email1);
+        TextPageData<User> pageData = null;
+        do {
+            pageData = userService.findTenantAdmins(tenantId, pageLink);
+            loadedTenantAdminsEmail1.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(tenantAdminsEmail1, idComparator);
+        Collections.sort(loadedTenantAdminsEmail1, idComparator);
+        
+        Assert.assertEquals(tenantAdminsEmail1, loadedTenantAdminsEmail1);
+        
+        List<User> loadedTenantAdminsEmail2 = new ArrayList<>();
+        pageLink = new TextPageLink(16, email2);
+        do {
+            pageData = userService.findTenantAdmins(tenantId, pageLink);
+            loadedTenantAdminsEmail2.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(tenantAdminsEmail2, idComparator);
+        Collections.sort(loadedTenantAdminsEmail2, idComparator);
+        
+        Assert.assertEquals(tenantAdminsEmail2, loadedTenantAdminsEmail2);
+        
+        for (User user : loadedTenantAdminsEmail1) {
+            userService.deleteUser(user.getId());
+        }
+        
+        pageLink = new TextPageLink(4, email1);
+        pageData = userService.findTenantAdmins(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        for (User user : loadedTenantAdminsEmail2) {
+            userService.deleteUser(user.getId());
+        }
+        
+        pageLink = new TextPageLink(4, email2);
+        pageData = userService.findTenantAdmins(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        tenantService.deleteTenant(tenantId);
+    }
+    
+    @Test
+    public void testFindCustomerUsers() {
+        User customerUser = userService.findUserByEmail("customer@thingsboard.org");
+        TextPageData<User> pageData = userService.findCustomerUsers(customerUser.getTenantId(),
+                customerUser.getCustomerId(), new TextPageLink(10));
+        Assert.assertFalse(pageData.hasNext());
+        List<User> users = pageData.getData();
+        Assert.assertEquals(1, users.size());
+        Assert.assertEquals(customerUser, users.get(0));
+        
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        Customer customer = new Customer();
+        customer.setTitle("Test customer");
+        customer.setTenantId(tenantId);
+        customer = customerService.saveCustomer(customer);
+        
+        CustomerId customerId = customer.getId();
+        
+        List<User> customerUsers = new ArrayList<>();
+        for (int i=0;i<156;i++) {
+            User user = new User();
+            user.setAuthority(Authority.CUSTOMER_USER);
+            user.setTenantId(tenantId);
+            user.setCustomerId(customerId);
+            user.setEmail("testCustomer" + i + "@thingsboard.org");
+            customerUsers.add(userService.saveUser(user));
+        }
+        
+        List<User> loadedCustomerUsers = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(33);
+        do {
+            pageData = userService.findCustomerUsers(tenantId, customerId, pageLink);
+            loadedCustomerUsers.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(customerUsers, idComparator);
+        Collections.sort(loadedCustomerUsers, idComparator);
+        
+        Assert.assertEquals(customerUsers, loadedCustomerUsers);
+        
+        tenantService.deleteTenant(tenantId);
+        
+        pageData = userService.findCustomerUsers(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+        
+    }
+    
+    @Test
+    public void testFindCustomerUsersByEmail() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+        
+        TenantId tenantId = tenant.getId();
+        
+        Customer customer = new Customer();
+        customer.setTitle("Test customer");
+        customer.setTenantId(tenantId);
+        customer = customerService.saveCustomer(customer);
+        
+        CustomerId customerId = customer.getId();
+        
+        String email1 = "testEmail1";        
+        List<User> customerUsersEmail1 = new ArrayList<>();
+        
+        for (int i=0;i<124;i++) {
+            User user = new User();
+            user.setAuthority(Authority.CUSTOMER_USER);
+            user.setTenantId(tenantId);
+            user.setCustomerId(customerId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(5 + Math.random()*10));
+            String email = email1+suffix+ "@thingsboard.org";
+            email = i % 2 == 0 ? email.toLowerCase() : email.toUpperCase();
+            user.setEmail(email);
+            customerUsersEmail1.add(userService.saveUser(user));
+        }
+        
+        String email2 = "testEmail2";        
+        List<User> customerUsersEmail2 = new ArrayList<>();
+        
+        for (int i=0;i<132;i++) {
+            User user = new User();
+            user.setAuthority(Authority.CUSTOMER_USER);
+            user.setTenantId(tenantId);
+            user.setCustomerId(customerId);
+            String suffix = RandomStringUtils.randomAlphanumeric((int)(5 + Math.random()*10));
+            String email = email2+suffix+ "@thingsboard.org";
+            email = i % 2 == 0 ? email.toLowerCase() : email.toUpperCase();
+            user.setEmail(email);
+            customerUsersEmail2.add(userService.saveUser(user));
+        }
+        
+        List<User> loadedCustomerUsersEmail1 = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(33, email1);
+        TextPageData<User> pageData = null;
+        do {
+            pageData = userService.findCustomerUsers(tenantId, customerId, pageLink);
+            loadedCustomerUsersEmail1.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(customerUsersEmail1, idComparator);
+        Collections.sort(loadedCustomerUsersEmail1, idComparator);
+        
+        Assert.assertEquals(customerUsersEmail1, loadedCustomerUsersEmail1);
+        
+        List<User> loadedCustomerUsersEmail2 = new ArrayList<>();
+        pageLink = new TextPageLink(16, email2);
+        do {
+            pageData = userService.findCustomerUsers(tenantId, customerId, pageLink);
+            loadedCustomerUsersEmail2.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+        
+        Collections.sort(customerUsersEmail2, idComparator);
+        Collections.sort(loadedCustomerUsersEmail2, idComparator);
+        
+        Assert.assertEquals(customerUsersEmail2, loadedCustomerUsersEmail2);
+        
+        for (User user : loadedCustomerUsersEmail1) {
+            userService.deleteUser(user.getId());
+        }
+        
+        pageLink = new TextPageLink(4, email1);
+        pageData = userService.findCustomerUsers(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        for (User user : loadedCustomerUsersEmail2) {
+            userService.deleteUser(user.getId());
+        }
+        
+        pageLink = new TextPageLink(4, email2);
+        pageData = userService.findCustomerUsers(tenantId, customerId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertEquals(0, pageData.getData().size());
+        
+        tenantService.deleteTenant(tenantId);
+    }
+
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java
new file mode 100644
index 0000000..09bb7ba
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetsBundleServiceImplTest.java
@@ -0,0 +1,430 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import com.datastax.driver.core.utils.UUIDs;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.page.TextPageData;
+import org.thingsboard.server.common.data.page.TextPageLink;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class WidgetsBundleServiceImplTest extends AbstractServiceTest {
+
+    private IdComparator<WidgetsBundle> idComparator = new IdComparator<>();
+
+    private TenantId tenantId;
+
+    @Before
+    public void before() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        tenantId = savedTenant.getId();
+    }
+
+    @After
+    public void after() {
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test
+    public void testSaveWidgetsBundle() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("My first widgets bundle");
+
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        Assert.assertNotNull(savedWidgetsBundle);
+        Assert.assertNotNull(savedWidgetsBundle.getId());
+        Assert.assertNotNull(savedWidgetsBundle.getAlias());
+        Assert.assertTrue(savedWidgetsBundle.getCreatedTime() > 0);
+        Assert.assertEquals(widgetsBundle.getTenantId(), savedWidgetsBundle.getTenantId());
+        Assert.assertEquals(widgetsBundle.getTitle(), savedWidgetsBundle.getTitle());
+
+        savedWidgetsBundle.setTitle("My new widgets bundle");
+
+        widgetsBundleService.saveWidgetsBundle(savedWidgetsBundle);
+        WidgetsBundle foundWidgetsBundle = widgetsBundleService.findWidgetsBundleById(savedWidgetsBundle.getId());
+        Assert.assertEquals(foundWidgetsBundle.getTitle(), savedWidgetsBundle.getTitle());
+
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveWidgetsBundleWithEmptyTitle() {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveWidgetsBundleWithInvalidTenant() {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTitle("My widgets bundle");
+        widgetsBundle.setTenantId(new TenantId(UUIDs.timeBased()));
+        widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testUpdateWidgetsBundleTenant() {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTitle("My widgets bundle");
+        widgetsBundle.setTenantId(tenantId);
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        savedWidgetsBundle.setTenantId(new TenantId(ModelConstants.NULL_UUID));
+        try {
+            widgetsBundleService.saveWidgetsBundle(savedWidgetsBundle);
+        } finally {
+            widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testUpdateWidgetsBundleAlias() {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTitle("My widgets bundle");
+        widgetsBundle.setTenantId(tenantId);
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        savedWidgetsBundle.setAlias("new_alias");
+        try {
+            widgetsBundleService.saveWidgetsBundle(savedWidgetsBundle);
+        } finally {
+            widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        }
+    }
+
+    @Test
+    public void testFindWidgetsBundleById() {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("My widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        WidgetsBundle foundWidgetsBundle = widgetsBundleService.findWidgetsBundleById(savedWidgetsBundle.getId());
+        Assert.assertNotNull(foundWidgetsBundle);
+        Assert.assertEquals(savedWidgetsBundle, foundWidgetsBundle);
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+    }
+
+    @Test
+    public void testFindWidgetsBundleByTenantIdAndAlias() {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("My widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        WidgetsBundle foundWidgetsBundle = widgetsBundleService.findWidgetsBundleByTenantIdAndAlias(tenantId, savedWidgetsBundle.getAlias());
+        Assert.assertNotNull(foundWidgetsBundle);
+        Assert.assertEquals(savedWidgetsBundle, foundWidgetsBundle);
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+    }
+
+    @Test
+    public void testDeleteWidgetsBundle() {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("My widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+        WidgetsBundle foundWidgetsBundle = widgetsBundleService.findWidgetsBundleById(savedWidgetsBundle.getId());
+        Assert.assertNotNull(foundWidgetsBundle);
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        foundWidgetsBundle = widgetsBundleService.findWidgetsBundleById(savedWidgetsBundle.getId());
+        Assert.assertNull(foundWidgetsBundle);
+    }
+
+    @Test
+    public void testFindSystemWidgetsBundlesByPageLink() {
+
+        TenantId tenantId = new TenantId(ModelConstants.NULL_UUID);
+
+        List<WidgetsBundle> systemWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles();
+        List<WidgetsBundle> createdWidgetsBundles = new ArrayList<>();
+        for (int i=0;i<235;i++) {
+            WidgetsBundle widgetsBundle = new WidgetsBundle();
+            widgetsBundle.setTenantId(tenantId);
+            widgetsBundle.setTitle("Widgets bundle "+i);
+            createdWidgetsBundles.add(widgetsBundleService.saveWidgetsBundle(widgetsBundle));
+        }
+
+        List<WidgetsBundle> widgetsBundles = new ArrayList<>(createdWidgetsBundles);
+        widgetsBundles.addAll(systemWidgetsBundles);
+
+        List<WidgetsBundle> loadedWidgetsBundles = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(19);
+        TextPageData<WidgetsBundle> pageData = null;
+        do {
+            pageData = widgetsBundleService.findSystemWidgetsBundlesByPageLink(pageLink);
+            loadedWidgetsBundles.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(widgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(widgetsBundles, loadedWidgetsBundles);
+
+        for (WidgetsBundle widgetsBundle : createdWidgetsBundles) {
+            widgetsBundleService.deleteWidgetsBundle(widgetsBundle.getId());
+        }
+
+        loadedWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles();
+
+        Collections.sort(systemWidgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(systemWidgetsBundles, loadedWidgetsBundles);
+    }
+
+    @Test
+    public void testFindSystemWidgetsBundles() {
+        TenantId tenantId = new TenantId(ModelConstants.NULL_UUID);
+
+        List<WidgetsBundle> systemWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles();
+
+        List<WidgetsBundle> createdWidgetsBundles = new ArrayList<>();
+        for (int i=0;i<135;i++) {
+            WidgetsBundle widgetsBundle = new WidgetsBundle();
+            widgetsBundle.setTenantId(tenantId);
+            widgetsBundle.setTitle("Widgets bundle "+i);
+            createdWidgetsBundles.add(widgetsBundleService.saveWidgetsBundle(widgetsBundle));
+        }
+
+        List<WidgetsBundle> widgetsBundles = new ArrayList<>(createdWidgetsBundles);
+        widgetsBundles.addAll(systemWidgetsBundles);
+
+        List<WidgetsBundle> loadedWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles();
+
+        Collections.sort(widgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(widgetsBundles, loadedWidgetsBundles);
+
+        for (WidgetsBundle widgetsBundle : createdWidgetsBundles) {
+            widgetsBundleService.deleteWidgetsBundle(widgetsBundle.getId());
+        }
+
+        loadedWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles();
+
+        Collections.sort(systemWidgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(systemWidgetsBundles, loadedWidgetsBundles);
+    }
+
+    @Test
+    public void testFindTenantWidgetsBundlesByTenantId() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+
+        TenantId tenantId = tenant.getId();
+
+        List<WidgetsBundle> widgetsBundles = new ArrayList<>();
+        for (int i=0;i<127;i++) {
+            WidgetsBundle widgetsBundle = new WidgetsBundle();
+            widgetsBundle.setTenantId(tenantId);
+            widgetsBundle.setTitle("Widgets bundle "+i);
+            widgetsBundles.add(widgetsBundleService.saveWidgetsBundle(widgetsBundle));
+        }
+
+        List<WidgetsBundle> loadedWidgetsBundles = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(11);
+        TextPageData<WidgetsBundle> pageData = null;
+        do {
+            pageData = widgetsBundleService.findTenantWidgetsBundlesByTenantId(tenantId, pageLink);
+            loadedWidgetsBundles.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(widgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(widgetsBundles, loadedWidgetsBundles);
+
+        widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
+
+        pageLink = new TextPageLink(15);
+        pageData = widgetsBundleService.findTenantWidgetsBundlesByTenantId(tenantId, pageLink);
+        Assert.assertFalse(pageData.hasNext());
+        Assert.assertTrue(pageData.getData().isEmpty());
+
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test
+    public void testFindAllWidgetsBundlesByTenantIdAndPageLink() {
+
+        List<WidgetsBundle> systemWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles();
+
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+
+        TenantId tenantId = tenant.getId();
+        TenantId systemTenantId = new TenantId(ModelConstants.NULL_UUID);
+
+        List<WidgetsBundle> createdWidgetsBundles = new ArrayList<>();
+        List<WidgetsBundle> createdSystemWidgetsBundles = new ArrayList<>();
+        for (int i=0;i<177;i++) {
+            WidgetsBundle widgetsBundle = new WidgetsBundle();
+            widgetsBundle.setTenantId(i % 2 == 0 ? tenantId : systemTenantId);
+            widgetsBundle.setTitle((i % 2 == 0 ? "Widgets bundle " : "System widget bundle ") + i);
+            WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+            createdWidgetsBundles.add(savedWidgetsBundle);
+            if (i % 2 == 1) {
+                createdSystemWidgetsBundles.add(savedWidgetsBundle);
+            }
+        }
+
+        List<WidgetsBundle> widgetsBundles = new ArrayList<>(createdWidgetsBundles);
+        widgetsBundles.addAll(systemWidgetsBundles);
+
+        List<WidgetsBundle> loadedWidgetsBundles = new ArrayList<>();
+        TextPageLink pageLink = new TextPageLink(17);
+        TextPageData<WidgetsBundle> pageData = null;
+        do {
+            pageData = widgetsBundleService.findAllTenantWidgetsBundlesByTenantIdAndPageLink(tenantId, pageLink);
+            loadedWidgetsBundles.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(widgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(widgetsBundles, loadedWidgetsBundles);
+
+        widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
+
+        loadedWidgetsBundles.clear();
+        pageLink = new TextPageLink(14);
+        do {
+            pageData = widgetsBundleService.findAllTenantWidgetsBundlesByTenantIdAndPageLink(tenantId, pageLink);
+            loadedWidgetsBundles.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        List<WidgetsBundle> allSystemWidgetsBundles = new ArrayList<>(systemWidgetsBundles);
+        allSystemWidgetsBundles.addAll(createdSystemWidgetsBundles);
+
+        Collections.sort(allSystemWidgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(allSystemWidgetsBundles, loadedWidgetsBundles);
+
+        for (WidgetsBundle widgetsBundle : createdSystemWidgetsBundles) {
+            widgetsBundleService.deleteWidgetsBundle(widgetsBundle.getId());
+        }
+
+        loadedWidgetsBundles.clear();
+        pageLink = new TextPageLink(18);
+        do {
+            pageData = widgetsBundleService.findAllTenantWidgetsBundlesByTenantIdAndPageLink(tenantId, pageLink);
+            loadedWidgetsBundles.addAll(pageData.getData());
+            if (pageData.hasNext()) {
+                pageLink = pageData.getNextPageLink();
+            }
+        } while (pageData.hasNext());
+
+        Collections.sort(systemWidgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(systemWidgetsBundles, loadedWidgetsBundles);
+
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test
+    public void testFindAllWidgetsBundlesByTenantId() {
+
+        List<WidgetsBundle> systemWidgetsBundles = widgetsBundleService.findSystemWidgetsBundles();
+
+        Tenant tenant = new Tenant();
+        tenant.setTitle("Test tenant");
+        tenant = tenantService.saveTenant(tenant);
+
+        TenantId tenantId = tenant.getId();
+        TenantId systemTenantId = new TenantId(ModelConstants.NULL_UUID);
+
+        List<WidgetsBundle> createdWidgetsBundles = new ArrayList<>();
+        List<WidgetsBundle> createdSystemWidgetsBundles = new ArrayList<>();
+        for (int i=0;i<277;i++) {
+            WidgetsBundle widgetsBundle = new WidgetsBundle();
+            widgetsBundle.setTenantId(i % 2 == 0 ? tenantId : systemTenantId);
+            widgetsBundle.setTitle((i % 2 == 0 ? "Widgets bundle " : "System widget bundle ") + i);
+            WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+            createdWidgetsBundles.add(savedWidgetsBundle);
+            if (i % 2 == 1) {
+                createdSystemWidgetsBundles.add(savedWidgetsBundle);
+            }
+        }
+
+        List<WidgetsBundle> widgetsBundles = new ArrayList<>(createdWidgetsBundles);
+        widgetsBundles.addAll(systemWidgetsBundles);
+
+        List<WidgetsBundle> loadedWidgetsBundles = widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(tenantId);
+
+        Collections.sort(widgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(widgetsBundles, loadedWidgetsBundles);
+
+        widgetsBundleService.deleteWidgetsBundlesByTenantId(tenantId);
+
+        loadedWidgetsBundles = widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(tenantId);
+
+        List<WidgetsBundle> allSystemWidgetsBundles = new ArrayList<>(systemWidgetsBundles);
+        allSystemWidgetsBundles.addAll(createdSystemWidgetsBundles);
+
+        Collections.sort(allSystemWidgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(allSystemWidgetsBundles, loadedWidgetsBundles);
+
+        for (WidgetsBundle widgetsBundle : createdSystemWidgetsBundles) {
+            widgetsBundleService.deleteWidgetsBundle(widgetsBundle.getId());
+        }
+
+        loadedWidgetsBundles = widgetsBundleService.findAllTenantWidgetsBundlesByTenantId(tenantId);
+
+        Collections.sort(systemWidgetsBundles, idComparator);
+        Collections.sort(loadedWidgetsBundles, idComparator);
+
+        Assert.assertEquals(systemWidgetsBundles, loadedWidgetsBundles);
+
+        tenantService.deleteTenant(tenantId);
+    }
+
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java
new file mode 100644
index 0000000..7a26c32
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/service/WidgetTypeServiceImplTest.java
@@ -0,0 +1,324 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.service;
+
+import com.datastax.driver.core.utils.UUIDs;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.thingsboard.server.common.data.Tenant;
+import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.widget.WidgetType;
+import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.dao.model.ModelConstants;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+public class WidgetTypeServiceImplTest extends AbstractServiceTest {
+
+    private IdComparator<WidgetType> idComparator = new IdComparator<>();
+
+    private TenantId tenantId;
+
+    @Before
+    public void before() {
+        Tenant tenant = new Tenant();
+        tenant.setTitle("My tenant");
+        Tenant savedTenant = tenantService.saveTenant(tenant);
+        Assert.assertNotNull(savedTenant);
+        tenantId = savedTenant.getId();
+    }
+
+    @After
+    public void after() {
+        tenantService.deleteTenant(tenantId);
+    }
+
+    @Test
+    public void testSaveWidgetType() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
+
+        Assert.assertNotNull(savedWidgetType);
+        Assert.assertNotNull(savedWidgetType.getId());
+        Assert.assertNotNull(savedWidgetType.getAlias());
+        Assert.assertTrue(savedWidgetType.getCreatedTime() > 0);
+        Assert.assertEquals(widgetType.getTenantId(), savedWidgetType.getTenantId());
+        Assert.assertEquals(widgetType.getName(), savedWidgetType.getName());
+        Assert.assertEquals(widgetType.getDescriptor(), savedWidgetType.getDescriptor());
+        Assert.assertEquals(savedWidgetsBundle.getAlias(), savedWidgetType.getBundleAlias());
+
+        savedWidgetType.setName("New Widget Type");
+
+        widgetTypeService.saveWidgetType(savedWidgetType);
+        WidgetType foundWidgetType = widgetTypeService.findWidgetTypeById(savedWidgetType.getId());
+        Assert.assertEquals(foundWidgetType.getName(), savedWidgetType.getName());
+
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveWidgetTypeWithEmptyName() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        try {
+            widgetTypeService.saveWidgetType(widgetType);
+        } finally {
+            widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveWidgetTypeWithEmptyBundleAlias() throws IOException {
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        widgetTypeService.saveWidgetType(widgetType);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveWidgetTypeWithEmptyDescriptor() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setName("Widget Type");
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setDescriptor(new ObjectMapper().readValue("{}", JsonNode.class));
+        try {
+            widgetTypeService.saveWidgetType(widgetType);
+        } finally {
+            widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveWidgetTypeWithInvalidTenant() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(new TenantId(UUIDs.timeBased()));
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        try {
+            widgetTypeService.saveWidgetType(widgetType);
+        } finally {
+            widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testSaveWidgetTypeWithInvalidBundleAlias() throws IOException {
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias("some_alias");
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        widgetTypeService.saveWidgetType(widgetType);
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testUpdateWidgetTypeTenant() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
+        savedWidgetType.setTenantId(new TenantId(ModelConstants.NULL_UUID));
+        try {
+            widgetTypeService.saveWidgetType(savedWidgetType);
+        } finally {
+            widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testUpdateWidgetTypeBundleAlias() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
+        savedWidgetType.setBundleAlias("some_alias");
+        try {
+            widgetTypeService.saveWidgetType(savedWidgetType);
+        } finally {
+            widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        }
+    }
+
+    @Test(expected = DataValidationException.class)
+    public void testUpdateWidgetTypeAlias() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
+        savedWidgetType.setAlias("some_alias");
+        try {
+            widgetTypeService.saveWidgetType(savedWidgetType);
+        } finally {
+            widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+        }
+    }
+
+    @Test
+    public void testFindWidgetTypeById() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
+        WidgetType foundWidgetType = widgetTypeService.findWidgetTypeById(savedWidgetType.getId());
+        Assert.assertNotNull(foundWidgetType);
+        Assert.assertEquals(savedWidgetType, foundWidgetType);
+
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+    }
+
+    @Test
+    public void testFindWidgetTypeByTenantIdBundleAliasAndAlias() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
+        WidgetType foundWidgetType = widgetTypeService.findWidgetTypeByTenantIdBundleAliasAndAlias(tenantId, savedWidgetsBundle.getAlias(), savedWidgetType.getAlias());
+        Assert.assertNotNull(foundWidgetType);
+        Assert.assertEquals(savedWidgetType, foundWidgetType);
+
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+    }
+
+    @Test
+    public void testDeleteWidgetType() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        WidgetType widgetType = new WidgetType();
+        widgetType.setTenantId(tenantId);
+        widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+        widgetType.setName("Widget Type");
+        widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+        WidgetType savedWidgetType = widgetTypeService.saveWidgetType(widgetType);
+        WidgetType foundWidgetType = widgetTypeService.findWidgetTypeById(savedWidgetType.getId());
+        Assert.assertNotNull(foundWidgetType);
+        widgetTypeService.deleteWidgetType(savedWidgetType.getId());
+        foundWidgetType = widgetTypeService.findWidgetTypeById(savedWidgetType.getId());
+        Assert.assertNull(foundWidgetType);
+
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+    }
+
+    @Test
+    public void testFindWidgetTypesByTenantIdAndBundleAlias() throws IOException {
+        WidgetsBundle widgetsBundle = new WidgetsBundle();
+        widgetsBundle.setTenantId(tenantId);
+        widgetsBundle.setTitle("Widgets bundle");
+        WidgetsBundle savedWidgetsBundle = widgetsBundleService.saveWidgetsBundle(widgetsBundle);
+
+        List<WidgetType> widgetTypes = new ArrayList<>();
+        for (int i=0;i<121;i++) {
+            WidgetType widgetType = new WidgetType();
+            widgetType.setTenantId(tenantId);
+            widgetType.setBundleAlias(savedWidgetsBundle.getAlias());
+            widgetType.setName("Widget Type " + i);
+            widgetType.setDescriptor(new ObjectMapper().readValue("{ \"someKey\": \"someValue\" }", JsonNode.class));
+            widgetTypes.add(widgetTypeService.saveWidgetType(widgetType));
+        }
+
+        List<WidgetType> loadedWidgetTypes = widgetTypeService.findWidgetTypesByTenantIdAndBundleAlias(tenantId, savedWidgetsBundle.getAlias());
+
+        Collections.sort(widgetTypes, idComparator);
+        Collections.sort(loadedWidgetTypes, idComparator);
+
+        Assert.assertEquals(widgetTypes, loadedWidgetTypes);
+
+        widgetTypeService.deleteWidgetTypesByTenantIdAndBundleAlias(tenantId, savedWidgetsBundle.getAlias());
+
+        loadedWidgetTypes = widgetTypeService.findWidgetTypesByTenantIdAndBundleAlias(tenantId, savedWidgetsBundle.getAlias());
+
+        Assert.assertTrue(loadedWidgetTypes.isEmpty());
+
+        widgetsBundleService.deleteWidgetsBundle(savedWidgetsBundle.getId());
+    }
+
+}

diff --git a/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java
new file mode 100644
index 0000000..91dd973
--- /dev/null
+++ b/dao/src/test/java/org/thingsboard/server/dao/timeseries/TimeseriesServiceTest.java
@@ -0,0 +1,140 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.thingsboard.server.dao.timeseries;
+
+import com.datastax.driver.core.ResultSet;
+import com.datastax.driver.core.ResultSetFuture;
+import com.datastax.driver.core.utils.UUIDs;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.thingsboard.server.common.data.DataConstants;
+import org.thingsboard.server.common.data.id.DeviceId;
+import org.thingsboard.server.dao.service.AbstractServiceTest;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.thingsboard.server.common.data.kv.*;
+
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * @author Andrew Shvayka
+ */
+
+@Slf4j
+public class TimeseriesServiceTest extends AbstractServiceTest {
+
+    private static final String STRING_KEY = "stringKey";
+    private static final String LONG_KEY = "longKey";
+    private static final String DOUBLE_KEY = "doubleKey";
+    private static final String BOOLEAN_KEY = "booleanKey";
+
+    public static final int PARTITION_MINUTES = 1100;
+
+    private static final long TS = 42L;
+
+    KvEntry stringKvEntry = new StringDataEntry(STRING_KEY, "value");
+    KvEntry longKvEntry = new LongDataEntry(LONG_KEY, Long.MAX_VALUE);
+    KvEntry doubleKvEntry = new DoubleDataEntry(DOUBLE_KEY, Double.MAX_VALUE);
+    KvEntry booleanKvEntry = new BooleanDataEntry(BOOLEAN_KEY, Boolean.TRUE);
+
+    @Test
+    public void testFindAllLatest() throws Exception {
+        DeviceId deviceId = new DeviceId(UUIDs.timeBased());
+
+        saveEntries(deviceId, TS - 2);
+        saveEntries(deviceId, TS - 1);
+        saveEntries(deviceId, TS);
+
+        ResultSetFuture rsFuture = tsService.findAllLatest(DataConstants.DEVICE, deviceId);
+        List<TsKvEntry> tsList = tsService.convertResultSetToTsKvEntryList(rsFuture.get());
+
+        assertNotNull(tsList);
+        assertEquals(4, tsList.size());
+        for (int i = 0; i < tsList.size(); i++) {
+            assertEquals(TS, tsList.get(i).getTs());
+        }
+
+        Collections.sort(tsList, (o1, o2) -> o1.getKey().compareTo(o2.getKey()));
+
+        List<TsKvEntry> expected = Arrays.asList(
+                toTsEntry(TS, stringKvEntry),
+                toTsEntry(TS, longKvEntry),
+                toTsEntry(TS, doubleKvEntry),
+                toTsEntry(TS, booleanKvEntry));
+        Collections.sort(expected, (o1, o2) -> o1.getKey().compareTo(o2.getKey()));
+
+        assertEquals(expected, tsList);
+    }
+
+    @Test
+    public void testFindLatest() throws Exception {
+        DeviceId deviceId = new DeviceId(UUIDs.timeBased());
+
+        saveEntries(deviceId, TS - 2);
+        saveEntries(deviceId, TS - 1);
+        saveEntries(deviceId, TS);
+
+        List<ResultSet> rs = tsService.findLatest(DataConstants.DEVICE, deviceId, Collections.singleton(STRING_KEY)).get();
+        Assert.assertEquals(1, rs.size());
+        Assert.assertEquals(toTsEntry(TS, stringKvEntry), tsService.convertResultToTsKvEntry(rs.get(0).one()));
+    }
+
+    @Test
+    public void testFindDeviceTsDataByQuery() throws Exception {
+        DeviceId deviceId = new DeviceId(UUIDs.timeBased());
+        LocalDateTime localDateTime = LocalDateTime.now(ZoneOffset.UTC).minusMinutes(PARTITION_MINUTES);
+        log.debug("Start event time is {}", localDateTime);
+        List<TsKvEntry> entries = new ArrayList<>(PARTITION_MINUTES);
+
+        for (int i = 0; i < PARTITION_MINUTES; i++) {
+            long time = localDateTime.plusMinutes(i).toInstant(ZoneOffset.UTC).toEpochMilli();
+            BasicTsKvEntry tsKvEntry = new BasicTsKvEntry(time, stringKvEntry);
+            tsService.save(DataConstants.DEVICE, deviceId, tsKvEntry).get();
+            entries.add(tsKvEntry);
+        }
+        log.debug("Saved all records {}", localDateTime);
+        List<TsKvEntry> list = tsService.find(DataConstants.DEVICE, deviceId, new BaseTsKvQuery(STRING_KEY, entries.get(599).getTs(),
+                LocalDateTime.now(ZoneOffset.UTC).toInstant(ZoneOffset.UTC).toEpochMilli()));
+        log.debug("Fetched records {}", localDateTime);
+        List<TsKvEntry> expected = entries.subList(600, PARTITION_MINUTES);
+        assertEquals(expected.size(), list.size());
+        assertEquals(expected, list);
+    }
+
+
+    private void saveEntries(DeviceId deviceId, long ts) throws ExecutionException, InterruptedException {
+        tsService.save(DataConstants.DEVICE, deviceId, toTsEntry(ts, stringKvEntry)).get();
+        tsService.save(DataConstants.DEVICE, deviceId, toTsEntry(ts, longKvEntry)).get();
+        tsService.save(DataConstants.DEVICE, deviceId, toTsEntry(ts, doubleKvEntry)).get();
+        tsService.save(DataConstants.DEVICE, deviceId, toTsEntry(ts, booleanKvEntry)).get();
+    }
+
+    private static TsKvEntry toTsEntry(long ts, KvEntry entry) {
+        return new BasicTsKvEntry(ts, entry);
+    }
+
+
+}

diff --git a/dao/src/test/resources/application-test.properties b/dao/src/test/resources/application-test.properties
new file mode 100644
index 0000000..b526b00
--- /dev/null
+++ b/dao/src/test/resources/application-test.properties
@@ -0,0 +1,7 @@
+cache.enabled=false
+cache.device_credentials.time_to_live=3600
+cache.device_credentials.max_size=1000000
+
+zk.enabled=false
+zk.url=localhost:2181
+zk.zk_dir=/thingsboard
\ No newline at end of file

diff --git a/dao/src/test/resources/cassandra-test.properties b/dao/src/test/resources/cassandra-test.properties
new file mode 100644
index 0000000..82fcbe1
--- /dev/null
+++ b/dao/src/test/resources/cassandra-test.properties
@@ -0,0 +1,49 @@
+cassandra.cluster_name=Thingsboard Cluster
+
+cassandra.keyspace_name=thingsboard
+
+cassandra.url=127.0.0.1:9142
+
+cassandra.ssl=false
+
+cassandra.jmx=false
+
+cassandra.metrics=true
+
+cassandra.compression=none
+
+cassandra.init_timeout_ms=60000
+
+cassandra.init_retry_interval_ms=3000
+
+cassandra.credentials=false
+
+cassandra.username=
+
+cassandra.password=
+
+cassandra.socket.connect_timeout=5000
+
+cassandra.socket.read_timeout=12000
+
+cassandra.socket.keep_alive=true
+
+cassandra.socket.reuse_address=true
+
+cassandra.socket.so_linger=
+
+cassandra.socket.tcp_no_delay=false
+
+cassandra.socket.receive_buffer_size=
+
+cassandra.socket.send_buffer_size=
+
+cassandra.query.read_consistency_level=ONE
+
+cassandra.query.write_consistency_level=ONE
+
+cassandra.query.default_fetch_size=2000
+
+cassandra.query.ts_key_value_partitioning=HOURS
+
+cassandra.query.max_limit_per_request=1000

diff --git a/dao/src/test/resources/cassandra-test.yaml b/dao/src/test/resources/cassandra-test.yaml
new file mode 100644
index 0000000..6463f64
--- /dev/null
+++ b/dao/src/test/resources/cassandra-test.yaml
@@ -0,0 +1,590 @@
+# Cassandra storage config YAML
+
+# NOTE:
+#   See http://wiki.apache.org/cassandra/StorageConfiguration for
+#   full explanations of configuration directives
+# /NOTE
+
+# The name of the cluster. This is mainly used to prevent machines in
+# one logical cluster from joining another.
+cluster_name: 'Test Cluster'
+
+# You should always specify InitialToken when setting up a production
+# cluster for the first time, and often when adding capacity later.
+# The principle is that each node should be given an equal slice of
+# the token ring; see http://wiki.apache.org/cassandra/Operations
+# for more details.
+#
+# If blank, Cassandra will request a token bisecting the range of
+# the heaviest-loaded existing node.  If there is no load information
+# available, such as is the case with a new cluster, it will pick
+# a random token, which will lead to hot spots.
+num_tokens: 1
+
+initial_token: 0
+
+# See http://wiki.apache.org/cassandra/HintedHandoff
+hinted_handoff_enabled: true
+# this defines the maximum amount of time a dead host will have hints
+# generated.  After it has been dead this long, new hints for it will not be
+# created until it has been seen alive and gone down again.
+max_hint_window_in_ms: 10800000 # 3 hours
+# Maximum throttle in KBs per second, per delivery thread.  This will be
+# reduced proportionally to the number of nodes in the cluster.  (If there
+# are two nodes in the cluster, each delivery thread will use the maximum
+# rate; if there are three, each will throttle to half of the maximum,
+# since we expect two nodes to be delivering hints simultaneously.)
+hinted_handoff_throttle_in_kb: 1024
+# Number of threads with which to deliver hints;
+# Consider increasing this number when you have multi-dc deployments, since
+# cross-dc handoff tends to be slower
+max_hints_delivery_threads: 2
+
+# The following setting populates the page cache on memtable flush and compaction
+# WARNING: Enable this setting only when the whole node's data fits in memory.
+# Defaults to: false
+# populate_io_cache_on_flush: false
+
+# Authentication backend, implementing IAuthenticator; used to identify users
+# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthenticator,
+# PasswordAuthenticator}.
+#
+# - AllowAllAuthenticator performs no checks - set it to disable authentication.
+# - PasswordAuthenticator relies on username/password pairs to authenticate
+#   users. It keeps usernames and hashed passwords in system_auth.credentials table.
+#   Please increase system_auth keyspace replication factor if you use this authenticator.
+authenticator: AllowAllAuthenticator
+
+# Authorization backend, implementing IAuthorizer; used to limit access/provide permissions
+# Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer,
+# CassandraAuthorizer}.
+#
+# - AllowAllAuthorizer allows any action to any user - set it to disable authorization.
+# - CassandraAuthorizer stores permissions in system_auth.permissions table. Please
+#   increase system_auth keyspace replication factor if you use this authorizer.
+authorizer: AllowAllAuthorizer
+
+# Validity period for permissions cache (fetching permissions can be an
+# expensive operation depending on the authorizer, CassandraAuthorizer is
+# one example). Defaults to 2000, set to 0 to disable.
+# Will be disabled automatically for AllowAllAuthorizer.
+permissions_validity_in_ms: 2000
+
+
+# The partitioner is responsible for distributing rows (by key) across
+# nodes in the cluster.  Any IPartitioner may be used, including your
+# own as long as it is on the classpath.  Out of the box, Cassandra
+# provides org.apache.cassandra.dht.{Murmur3Partitioner, RandomPartitioner
+# ByteOrderedPartitioner, OrderPreservingPartitioner (deprecated)}.
+#
+# - RandomPartitioner distributes rows across the cluster evenly by md5.
+#   This is the default prior to 1.2 and is retained for compatibility.
+# - Murmur3Partitioner is similar to RandomPartioner but uses Murmur3_128
+#   Hash Function instead of md5.  When in doubt, this is the best option.
+# - ByteOrderedPartitioner orders rows lexically by key bytes.  BOP allows
+#   scanning rows in key order, but the ordering can generate hot spots
+#   for sequential insertion workloads.
+# - OrderPreservingPartitioner is an obsolete form of BOP, that stores
+# - keys in a less-efficient format and only works with keys that are
+#   UTF8-encoded Strings.
+# - CollatingOPP collates according to EN,US rules rather than lexical byte
+#   ordering.  Use this as an example if you need custom collation.
+#
+# See http://wiki.apache.org/cassandra/Operations for more on
+# partitioners and token selection.
+partitioner: org.apache.cassandra.dht.Murmur3Partitioner
+
+# directories where Cassandra should store data on disk.
+data_file_directories:
+    - target/embeddedCassandra/data
+
+# commit log
+commitlog_directory: target/embeddedCassandra/commitlog
+
+hints_directory: target/embeddedCassandra/hints
+
+# policy for data disk failures:
+# stop: shut down gossip and Thrift, leaving the node effectively dead, but
+#       can still be inspected via JMX.
+# best_effort: stop using the failed disk and respond to requests based on
+#              remaining available sstables.  This means you WILL see obsolete
+#              data at CL.ONE!
+# ignore: ignore fatal errors and let requests fail, as in pre-1.2 Cassandra
+disk_failure_policy: stop
+
+
+# Maximum size of the key cache in memory.
+#
+# Each key cache hit saves 1 seek and each row cache hit saves 2 seeks at the
+# minimum, sometimes more. The key cache is fairly tiny for the amount of
+# time it saves, so it's worthwhile to use it at large numbers.
+# The row cache saves even more time, but must store the whole values of
+# its rows, so it is extremely space-intensive. It's best to only use the
+# row cache if you have hot rows or static rows.
+#
+# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup.
+#
+# Default value is empty to make it "auto" (min(5% of Heap (in MB), 100MB)). Set to 0 to disable key cache.
+key_cache_size_in_mb:
+
+# Duration in seconds after which Cassandra should
+# safe the keys cache. Caches are saved to saved_caches_directory as
+# specified in this configuration file.
+#
+# Saved caches greatly improve cold-start speeds, and is relatively cheap in
+# terms of I/O for the key cache. Row cache saving is much more expensive and
+# has limited use.
+#
+# Default is 14400 or 4 hours.
+key_cache_save_period: 14400
+
+# Number of keys from the key cache to save
+# Disabled by default, meaning all keys are going to be saved
+# key_cache_keys_to_save: 100
+
+# Maximum size of the row cache in memory.
+# NOTE: if you reduce the size, you may not get you hottest keys loaded on startup.
+#
+# Default value is 0, to disable row caching.
+row_cache_size_in_mb: 0
+
+# Duration in seconds after which Cassandra should
+# safe the row cache. Caches are saved to saved_caches_directory as specified
+# in this configuration file.
+#
+# Saved caches greatly improve cold-start speeds, and is relatively cheap in
+# terms of I/O for the key cache. Row cache saving is much more expensive and
+# has limited use.
+#
+# Default is 0 to disable saving the row cache.
+row_cache_save_period: 0
+
+# Number of keys from the row cache to save
+# Disabled by default, meaning all keys are going to be saved
+# row_cache_keys_to_save: 100
+
+# saved caches
+saved_caches_directory: target/embeddedCassandra/saved_caches
+
+# commitlog_sync may be either "periodic" or "batch."
+# When in batch mode, Cassandra won't ack writes until the commit log
+# has been fsynced to disk.  It will wait up to
+# commitlog_sync_batch_window_in_ms milliseconds for other writes, before
+# performing the sync.
+#
+# commitlog_sync: batch
+# commitlog_sync_batch_window_in_ms: 50
+#
+# the other option is "periodic" where writes may be acked immediately
+# and the CommitLog is simply synced every commitlog_sync_period_in_ms
+# milliseconds.
+commitlog_sync: periodic
+commitlog_sync_period_in_ms: 10000
+
+# The size of the individual commitlog file segments.  A commitlog
+# segment may be archived, deleted, or recycled once all the data
+# in it (potentially from each columnfamily in the system) has been
+# flushed to sstables.
+#
+# The default size is 32, which is almost always fine, but if you are
+# archiving commitlog segments (see commitlog_archiving.properties),
+# then you probably want a finer granularity of archiving; 8 or 16 MB
+# is reasonable.
+commitlog_segment_size_in_mb: 32
+
+# any class that implements the SeedProvider interface and has a
+# constructor that takes a Map<String, String> of parameters will do.
+seed_provider:
+    # Addresses of hosts that are deemed contact points.
+    # Cassandra nodes use this list of hosts to find each other and learn
+    # the topology of the ring.  You must change this if you are running
+    # multiple nodes!
+    - class_name: org.apache.cassandra.locator.SimpleSeedProvider
+      parameters:
+          # seeds is actually a comma-delimited list of addresses.
+          # Ex: "<ip1>,<ip2>,<ip3>"
+          - seeds: "127.0.0.1"
+
+
+# For workloads with more data than can fit in memory, Cassandra's
+# bottleneck will be reads that need to fetch data from
+# disk. "concurrent_reads" should be set to (16 * number_of_drives) in
+# order to allow the operations to enqueue low enough in the stack
+# that the OS and drives can reorder them.
+#
+# On the other hand, since writes are almost never IO bound, the ideal
+# number of "concurrent_writes" is dependent on the number of cores in
+# your system; (8 * number_of_cores) is a good rule of thumb.
+concurrent_reads: 32
+concurrent_writes: 32
+
+# Total memory to use for memtables.  Cassandra will flush the largest
+# memtable when this much memory is used.
+# If omitted, Cassandra will set it to 1/3 of the heap.
+# memtable_total_space_in_mb: 2048
+
+# Total space to use for commitlogs.
+# If space gets above this value (it will round up to the next nearest
+# segment multiple), Cassandra will flush every dirty CF in the oldest
+# segment and remove it.
+# commitlog_total_space_in_mb: 4096
+
+# This sets the amount of memtable flush writer threads.  These will
+# be blocked by disk io, and each one will hold a memtable in memory
+# while blocked. If you have a large heap and many data directories,
+# you can increase this value for better flush performance.
+# By default this will be set to the amount of data directories defined.
+#memtable_flush_writers: 1
+
+# the number of full memtables to allow pending flush, that is,
+# waiting for a writer thread.  At a minimum, this should be set to
+# the maximum number of secondary indexes created on a single CF.
+#memtable_flush_queue_size: 4
+
+# Whether to, when doing sequential writing, fsync() at intervals in
+# order to force the operating system to flush the dirty
+# buffers. Enable this to avoid sudden dirty buffer flushing from
+# impacting read latencies. Almost always a good idea on SSD:s; not
+# necessarily on platters.
+trickle_fsync: false
+trickle_fsync_interval_in_kb: 10240
+
+# TCP port, for commands and data
+storage_port: 7010
+
+# SSL port, for encrypted communication.  Unused unless enabled in
+# encryption_options
+ssl_storage_port: 7011
+
+# Address to bind to and tell other Cassandra nodes to connect to. You
+# _must_ change this if you want multiple nodes to be able to
+# communicate!
+#
+# Leaving it blank leaves it up to InetAddress.getLocalHost(). This
+# will always do the Right Thing *if* the node is properly configured
+# (hostname, name resolution, etc), and the Right Thing is to use the
+# address associated with the hostname (it might not be).
+#
+# Setting this to 0.0.0.0 is always wrong.
+listen_address: 127.0.0.1
+
+start_native_transport: true
+# port for the CQL native transport to listen for clients on
+native_transport_port: 9142
+
+# Whether to start the thrift rpc server.
+start_rpc: false
+
+# Address to broadcast to other Cassandra nodes
+# Leaving this blank will set it to the same value as listen_address
+# broadcast_address: 1.2.3.4
+
+# The address to bind the Thrift RPC service to -- clients connect
+# here. Unlike ListenAddress above, you *can* specify 0.0.0.0 here if
+# you want Thrift to listen on all interfaces.
+#
+# Leaving this blank has the same effect it does for ListenAddress,
+# (i.e. it will be based on the configured hostname of the node).
+rpc_address: localhost
+# port for Thrift to listen for clients on
+rpc_port: 9171
+
+# enable or disable keepalive on rpc connections
+rpc_keepalive: true
+
+# Cassandra provides three options for the RPC Server:
+#
+# sync  -> One connection per thread in the rpc pool (see below).
+#          For a very large number of clients, memory will be your limiting
+#          factor; on a 64 bit JVM, 128KB is the minimum stack size per thread.
+#          Connection pooling is very, very strongly recommended.
+#
+# async -> Nonblocking server implementation with one thread to serve
+#          rpc connections.  This is not recommended for high throughput use
+#          cases. Async has been tested to be about 50% slower than sync
+#          or hsha and is deprecated: it will be removed in the next major release.
+#
+# hsha  -> Stands for "half synchronous, half asynchronous." The rpc thread pool
+#          (see below) is used to manage requests, but the threads are multiplexed
+#          across the different clients.
+#
+# The default is sync because on Windows hsha is about 30% slower.  On Linux,
+# sync/hsha performance is about the same, with hsha of course using less memory.
+rpc_server_type: sync
+
+# Uncomment rpc_min|max|thread to set request pool size.
+# You would primarily set max for the sync server to safeguard against
+# misbehaved clients; if you do hit the max, Cassandra will block until one
+# disconnects before accepting more.  The defaults for sync are min of 16 and max
+# unlimited.
+#
+# For the Hsha server, the min and max both default to quadruple the number of
+# CPU cores.
+#
+# This configuration is ignored by the async server.
+#
+# rpc_min_threads: 16
+# rpc_max_threads: 2048
+
+# uncomment to set socket buffer sizes on rpc connections
+# rpc_send_buff_size_in_bytes:
+# rpc_recv_buff_size_in_bytes:
+
+# Frame size for thrift (maximum field length).
+# 0 disables TFramedTransport in favor of TSocket. This option
+# is deprecated; we strongly recommend using Framed mode.
+thrift_framed_transport_size_in_mb: 15
+
+# The max length of a thrift message, including all fields and
+# internal thrift overhead.
+thrift_max_message_length_in_mb: 16
+
+# Set to true to have Cassandra create a hard link to each sstable
+# flushed or streamed locally in a backups/ subdirectory of the
+# Keyspace data.  Removing these links is the operator's
+# responsibility.
+incremental_backups: false
+
+# Whether or not to take a snapshot before each compaction.  Be
+# careful using this option, since Cassandra won't clean up the
+# snapshots for you.  Mostly useful if you're paranoid when there
+# is a data format change.
+snapshot_before_compaction: false
+
+# Whether or not a snapshot is taken of the data before keyspace truncation
+# or dropping of column families. The STRONGLY advised default of true
+# should be used to provide data safety. If you set this flag to false, you will
+# lose data on truncation or drop.
+auto_snapshot: false
+
+# Add column indexes to a row after its contents reach this size.
+# Increase if your column values are large, or if you have a very large
+# number of columns.  The competing causes are, Cassandra has to
+# deserialize this much of the row to read a single column, so you want
+# it to be small - at least if you do many partial-row reads - but all
+# the index data is read for each access, so you don't want to generate
+# that wastefully either.
+column_index_size_in_kb: 64
+
+# Size limit for rows being compacted in memory.  Larger rows will spill
+# over to disk and use a slower two-pass compaction process.  A message
+# will be logged specifying the row key.
+#in_memory_compaction_limit_in_mb: 64
+
+# Number of simultaneous compactions to allow, NOT including
+# validation "compactions" for anti-entropy repair.  Simultaneous
+# compactions can help preserve read performance in a mixed read/write
+# workload, by mitigating the tendency of small sstables to accumulate
+# during a single long running compactions. The default is usually
+# fine and if you experience problems with compaction running too
+# slowly or too fast, you should look at
+# compaction_throughput_mb_per_sec first.
+#
+# This setting has no effect on LeveledCompactionStrategy.
+#
+# concurrent_compactors defaults to the number of cores.
+# Uncomment to make compaction mono-threaded, the pre-0.8 default.
+#concurrent_compactors: 1
+
+# Multi-threaded compaction. When enabled, each compaction will use
+# up to one thread per core, plus one thread per sstable being merged.
+# This is usually only useful for SSD-based hardware: otherwise,
+# your concern is usually to get compaction to do LESS i/o (see:
+# compaction_throughput_mb_per_sec), not more.
+#multithreaded_compaction: false
+
+# Throttles compaction to the given total throughput across the entire
+# system. The faster you insert data, the faster you need to compact in
+# order to keep the sstable count down, but in general, setting this to
+# 16 to 32 times the rate you are inserting data is more than sufficient.
+# Setting this to 0 disables throttling. Note that this account for all types
+# of compaction, including validation compaction.
+compaction_throughput_mb_per_sec: 16
+
+# Track cached row keys during compaction, and re-cache their new
+# positions in the compacted sstable.  Disable if you use really large
+# key caches.
+#compaction_preheat_key_cache: true
+
+# Throttles all outbound streaming file transfers on this node to the
+# given total throughput in Mbps. This is necessary because Cassandra does
+# mostly sequential IO when streaming data during bootstrap or repair, which
+# can lead to saturating the network connection and degrading rpc performance.
+# When unset, the default is 200 Mbps or 25 MB/s.
+# stream_throughput_outbound_megabits_per_sec: 200
+
+# How long the coordinator should wait for read operations to complete
+read_request_timeout_in_ms: 5000
+# How long the coordinator should wait for seq or index scans to complete
+range_request_timeout_in_ms: 10000
+# How long the coordinator should wait for writes to complete
+write_request_timeout_in_ms: 10000
+# How long a coordinator should continue to retry a CAS operation
+# that contends with other proposals for the same row
+cas_contention_timeout_in_ms: 1000
+# How long the coordinator should wait for truncates to complete
+# (This can be much longer, because unless auto_snapshot is disabled
+# we need to flush first so we can snapshot before removing the data.)
+truncate_request_timeout_in_ms: 60000
+# The default timeout for other, miscellaneous operations
+request_timeout_in_ms: 10000
+
+# Enable operation timeout information exchange between nodes to accurately
+# measure request timeouts.  If disabled, replicas will assume that requests
+# were forwarded to them instantly by the coordinator, which means that
+# under overload conditions we will waste that much extra time processing
+# already-timed-out requests.
+#
+# Warning: before enabling this property make sure to ntp is installed
+# and the times are synchronized between the nodes.
+cross_node_timeout: false
+
+# Enable socket timeout for streaming operation.
+# When a timeout occurs during streaming, streaming is retried from the start
+# of the current file. This _can_ involve re-streaming an important amount of
+# data, so you should avoid setting the value too low.
+# Default value is 0, which never timeout streams.
+# streaming_socket_timeout_in_ms: 0
+
+# phi value that must be reached for a host to be marked down.
+# most users should never need to adjust this.
+# phi_convict_threshold: 8
+
+# endpoint_snitch -- Set this to a class that implements
+# IEndpointSnitch.  The snitch has two functions:
+# - it teaches Cassandra enough about your network topology to route
+#   requests efficiently
+# - it allows Cassandra to spread replicas around your cluster to avoid
+#   correlated failures. It does this by grouping machines into
+#   "datacenters" and "racks."  Cassandra will do its best not to have
+#   more than one replica on the same "rack" (which may not actually
+#   be a physical location)
+#
+# IF YOU CHANGE THE SNITCH AFTER DATA IS INSERTED INTO THE CLUSTER,
+# YOU MUST RUN A FULL REPAIR, SINCE THE SNITCH AFFECTS WHERE REPLICAS
+# ARE PLACED.
+#
+# Out of the box, Cassandra provides
+#  - SimpleSnitch:
+#    Treats Strategy order as proximity. This improves cache locality
+#    when disabling read repair, which can further improve throughput.
+#    Only appropriate for single-datacenter deployments.
+#  - PropertyFileSnitch:
+#    Proximity is determined by rack and data center, which are
+#    explicitly configured in cassandra-topology.properties.
+#  - RackInferringSnitch:
+#    Proximity is determined by rack and data center, which are
+#    assumed to correspond to the 3rd and 2nd octet of each node's
+#    IP address, respectively.  Unless this happens to match your
+#    deployment conventions (as it did Facebook's), this is best used
+#    as an example of writing a custom Snitch class.
+#  - Ec2Snitch:
+#    Appropriate for EC2 deployments in a single Region.  Loads Region
+#    and Availability Zone information from the EC2 API. The Region is
+#    treated as the Datacenter, and the Availability Zone as the rack.
+#    Only private IPs are used, so this will not work across multiple
+#    Regions.
+#  - Ec2MultiRegionSnitch:
+#    Uses public IPs as broadcast_address to allow cross-region
+#    connectivity.  (Thus, you should set seed addresses to the public
+#    IP as well.) You will need to open the storage_port or
+#    ssl_storage_port on the public IP firewall.  (For intra-Region
+#    traffic, Cassandra will switch to the private IP after
+#    establishing a connection.)
+#
+# You can use a custom Snitch by setting this to the full class name
+# of the snitch, which will be assumed to be on your classpath.
+endpoint_snitch: SimpleSnitch
+
+# controls how often to perform the more expensive part of host score
+# calculation
+dynamic_snitch_update_interval_in_ms: 100
+# controls how often to reset all host scores, allowing a bad host to
+# possibly recover
+dynamic_snitch_reset_interval_in_ms: 600000
+# if set greater than zero and read_repair_chance is < 1.0, this will allow
+# 'pinning' of replicas to hosts in order to increase cache capacity.
+# The badness threshold will control how much worse the pinned host has to be
+# before the dynamic snitch will prefer other replicas over it.  This is
+# expressed as a double which represents a percentage.  Thus, a value of
+# 0.2 means Cassandra would continue to prefer the static snitch values
+# until the pinned host was 20% worse than the fastest.
+dynamic_snitch_badness_threshold: 0.1
+
+# request_scheduler -- Set this to a class that implements
+# RequestScheduler, which will schedule incoming client requests
+# according to the specific policy. This is useful for multi-tenancy
+# with a single Cassandra cluster.
+# NOTE: This is specifically for requests from the client and does
+# not affect inter node communication.
+# org.apache.cassandra.scheduler.NoScheduler - No scheduling takes place
+# org.apache.cassandra.scheduler.RoundRobinScheduler - Round robin of
+# client requests to a node with a separate queue for each
+# request_scheduler_id. The scheduler is further customized by
+# request_scheduler_options as described below.
+request_scheduler: org.apache.cassandra.scheduler.NoScheduler
+
+# Scheduler Options vary based on the type of scheduler
+# NoScheduler - Has no options
+# RoundRobin
+#  - throttle_limit -- The throttle_limit is the number of in-flight
+#                      requests per client.  Requests beyond
+#                      that limit are queued up until
+#                      running requests can complete.
+#                      The value of 80 here is twice the number of
+#                      concurrent_reads + concurrent_writes.
+#  - default_weight -- default_weight is optional and allows for
+#                      overriding the default which is 1.
+#  - weights -- Weights are optional and will default to 1 or the
+#               overridden default_weight. The weight translates into how
+#               many requests are handled during each turn of the
+#               RoundRobin, based on the scheduler id.
+#
+# request_scheduler_options:
+#    throttle_limit: 80
+#    default_weight: 5
+#    weights:
+#      Keyspace1: 1
+#      Keyspace2: 5
+
+# request_scheduler_id -- An identifer based on which to perform
+# the request scheduling. Currently the only valid option is keyspace.
+# request_scheduler_id: keyspace
+
+# index_interval controls the sampling of entries from the primrary
+# row index in terms of space versus time.  The larger the interval,
+# the smaller and less effective the sampling will be.  In technicial
+# terms, the interval coresponds to the number of index entries that
+# are skipped between taking each sample.  All the sampled entries
+# must fit in memory.  Generally, a value between 128 and 512 here
+# coupled with a large key cache size on CFs results in the best trade
+# offs.  This value is not often changed, however if you have many
+# very small rows (many to an OS page), then increasing this will
+# often lower memory usage without a impact on performance.
+index_interval: 128
+
+# Enable or disable inter-node encryption
+# Default settings are TLS v1, RSA 1024-bit keys (it is imperative that
+# users generate their own keys) TLS_RSA_WITH_AES_128_CBC_SHA as the cipher
+# suite for authentication, key exchange and encryption of the actual data transfers.
+# NOTE: No custom encryption options are enabled at the moment
+# The available internode options are : all, none, dc, rack
+#
+# If set to dc cassandra will encrypt the traffic between the DCs
+# If set to rack cassandra will encrypt the traffic between the racks
+#
+# The passwords used in these options must match the passwords used when generating
+# the keystore and truststore.  For instructions on generating these files, see:
+# http://download.oracle.com/javase/6/docs/technotes/guides/security/jsse/JSSERefGuide.html#CreateKeystore
+#
+server_encryption_options:
+    internode_encryption: none
+    keystore: conf/.keystore
+    keystore_password: cassandra
+    truststore: conf/.truststore
+    truststore_password: cassandra
+    # More advanced defaults below:
+    # protocol: TLS
+    # algorithm: SunX509
+    # store_type: JKS
+    # cipher_suites: [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA]
\ No newline at end of file

diff --git a/dao/src/test/resources/logback.xml b/dao/src/test/resources/logback.xml
new file mode 100644
index 0000000..0969bbe
--- /dev/null
+++ b/dao/src/test/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<configuration>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{ISO8601} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.thingsboard.server.dao" level="TRACE"/>
+    <logger name="org.apache.cassandra" level="WARN"/>
+    <logger name="org.cassandraunit" level="INFO" />
+    <logger name="org.apache.cassandra" level="INFO" />
+
+    <root level="WARN">
+        <appender-ref ref="console"/>
+    </root>
+
+</configuration>

diff --git a/dao/src/test/resources/system-test.cql b/dao/src/test/resources/system-test.cql
new file mode 100644
index 0000000..da5d1f1
--- /dev/null
+++ b/dao/src/test/resources/system-test.cql
@@ -0,0 +1,2 @@
+TRUNCATE thingsboard.plugin;
+TRUNCATE thingsboard.rule;
\ No newline at end of file

diff --git a/dao/src/test/resources/TestJsonData.json b/dao/src/test/resources/TestJsonData.json
new file mode 100644
index 0000000..22e3ab3
--- /dev/null
+++ b/dao/src/test/resources/TestJsonData.json
@@ -0,0 +1,5 @@
+{
+  "fieldA": "field A value",
+  "fieldB": "field B value",
+  "fieldC": 42
+}
\ No newline at end of file

diff --git a/dao/src/test/resources/TestJsonDescriptor.json b/dao/src/test/resources/TestJsonDescriptor.json
new file mode 100644
index 0000000..4c8c7a4
--- /dev/null
+++ b/dao/src/test/resources/TestJsonDescriptor.json
@@ -0,0 +1,27 @@
+{
+  "schema": {
+    "title": "Simple Schema",
+    "type": "object",
+    "properties": {
+      "fieldA": {
+        "type": "string"
+      },
+      "fieldB": {
+        "type": "string"
+      },
+      "fieldC": {
+        "description": "Age in years",
+        "type": "integer",
+        "minimum": 0
+      }
+    },
+    "required": [
+      "fieldA",
+      "fieldB",
+      "fieldC"
+    ]
+  },
+  "form": [
+    "*"
+  ]
+}
\ No newline at end of file

diff --git a/ui/.babelrc b/ui/.babelrc
new file mode 100644
index 0000000..7093a61
--- /dev/null
+++ b/ui/.babelrc
@@ -0,0 +1,9 @@
+{
+  "presets": [
+    "react",
+    "es2015"
+  ],
+  "plugins": [
+    "react-hot-loader/babel"
+  ]
+}

diff --git a/ui/.eslintrc b/ui/.eslintrc
new file mode 100644
index 0000000..5cb89e5
--- /dev/null
+++ b/ui/.eslintrc
@@ -0,0 +1,15 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+    "angular"
+  ],
+  "parser": "babel-eslint",
+  "settings": {
+    "import/ignore": [
+      "node_modules",
+      "\\.tpl\\.html$"
+    ]
+  }
+}

diff --git a/ui/.gitignore b/ui/.gitignore
new file mode 100644
index 0000000..09daa48
--- /dev/null
+++ b/ui/.gitignore
@@ -0,0 +1,2 @@
+node_modules
+.tern-project

diff --git a/ui/.jshintrc b/ui/.jshintrc
new file mode 100644
index 0000000..6f00218
--- /dev/null
+++ b/ui/.jshintrc
@@ -0,0 +1,13 @@
+{
+  "globalstrict": true,
+  "globals": {
+    "angular": false,
+    "describe": false,
+    "it": false,
+    "expect": false,
+    "beforeEach": false,
+    "afterEach": false,
+    "module": false,
+    "inject": false
+  }
+}
\ No newline at end of file

diff --git a/ui/package.json b/ui/package.json
new file mode 100644
index 0000000..b8a0775
--- /dev/null
+++ b/ui/package.json
@@ -0,0 +1,123 @@
+{
+  "name": "thingsboard",
+  "private": true,
+  "version": "0.0.1",
+  "description": "Thingsboard UI",
+  "licenses": [
+    {
+      "type": "Apache-2.0",
+      "url": "http://www.apache.org/licenses/LICENSE-2.0"
+    }
+  ],
+  "scripts": {
+    "start": "babel-node --max_old_space_size=4096 server.js",
+    "build": "NODE_ENV=production webpack -p"
+  },
+  "dependencies": {
+    "ace-builds": "^1.2.5",
+    "angular": "^1.5.8",
+    "angular-animate": "^1.5.8",
+    "angular-aria": "^1.5.8",
+    "angular-breadcrumb": "^0.4.1",
+    "angular-carousel": "^1.0.1",
+    "angular-cookies": "^1.5.8",
+    "angular-drag-and-drop-lists": "^1.4.0",
+    "angular-fullscreen": "git://github.com/fabiobiondi/angular-fullscreen.git#master",
+    "angular-gridster": "^0.13.14",
+    "angular-hotkeys": "^1.7.0",
+    "angular-jwt": "^0.1.6",
+    "angular-material": "^1.1.1",
+    "angular-material-data-table": "^0.10.9",
+    "angular-material-icons": "^0.7.1",
+    "angular-messages": "^1.5.8",
+    "angular-route": "^1.5.8",
+    "angular-sanitize": "^1.5.8",
+    "angular-storage": "0.0.15",
+    "angular-touch": "^1.5.8",
+    "angular-translate": "^2.12.1",
+    "angular-translate-handler-log": "^2.12.1",
+    "angular-translate-interpolation-messageformat": "^2.12.1",
+    "angular-translate-loader-static-files": "^2.12.1",
+    "angular-translate-storage-cookie": "^2.12.1",
+    "angular-translate-storage-local": "^2.12.1",
+    "angular-ui-ace": "^0.2.3",
+    "angular-ui-router": "^0.3.1",
+    "angular-websocket": "^2.0.1",
+    "brace": "^0.8.0",
+    "canvas-gauges": "^2.0.9",
+    "clipboard": "^1.5.15",
+    "compass-sass-mixins": "^0.12.7",
+    "font-awesome": "^4.6.3",
+    "jquery": "^3.1.0",
+    "js-beautify": "^1.6.4",
+    "json-schema-defaults": "^0.2.0",
+    "justgage": "^1.2.2",
+    "material-ui": "^0.16.1",
+    "md-color-picker": "^0.2.6",
+    "mdPickers": "git://github.com/alenaksu/mdPickers.git#0.7.5",
+    "moment": "^2.15.0",
+    "ngclipboard": "^1.1.1",
+    "ngreact": "^0.3.0",
+    "objectpath": "^1.2.1",
+    "oclazyload": "^1.0.9",
+    "raphael": "^2.2.7",
+    "rc-select": "^6.6.1",
+    "react": "^15.3.2",
+    "react-ace": "^3.7.0",
+    "react-dom": "^15.3.2",
+    "react-schema-form": "^0.2.10",
+    "react-tap-event-plugin": "^1.0.0",
+    "reactcss": "^1.0.9",
+    "sass-material-colors": "0.0.5",
+    "schema-inspector": "^1.6.6",
+    "split.js": "^1.0.7",
+    "tinycolor2": "^1.4.1",
+    "v-accordion": "^1.6.0"
+  },
+  "devDependencies": {
+    "babel-cli": "^6.18.0",
+    "babel-core": "^6.14.0",
+    "babel-eslint": "^6.1.2",
+    "babel-loader": "^6.2.5",
+    "babel-preset-es2015": "^6.14.0",
+    "babel-preset-react": "^6.16.0",
+    "connect-history-api-fallback": "^1.3.0",
+    "copy-webpack-plugin": "^3.0.1",
+    "css-loader": "^0.25.0",
+    "eslint": "^3.4.0",
+    "eslint-config-angular": "^0.5.0",
+    "eslint-loader": "^1.5.0",
+    "eslint-plugin-angular": "^1.3.1",
+    "eslint-plugin-import": "^1.14.0",
+    "extract-text-webpack-plugin": "^1.0.1",
+    "file-loader": "^0.9.0",
+    "html-loader": "^0.4.3",
+    "html-minifier": "^3.2.2",
+    "html-minifier-loader": "^1.3.4",
+    "html-webpack-plugin": "^2.22.0",
+    "img-loader": "^1.3.1",
+    "less": "^2.7.1",
+    "less-loader": "^2.2.3",
+    "ng-annotate-loader": "^0.1.1",
+    "ngtemplate-loader": "^1.3.1",
+    "node-sass": "^3.9.3",
+    "postcss-loader": "^0.13.0",
+    "react-hot-loader": "^3.0.0-beta.6",
+    "sass-loader": "^4.0.2",
+    "style-loader": "^0.13.1",
+    "url-loader": "^0.5.7",
+    "webpack": "^1.13.2",
+    "webpack-dev-middleware": "^1.6.1",
+    "webpack-dev-server": "^1.15.1",
+    "webpack-hot-middleware": "^2.12.2"
+  },
+  "engine": "node >= 5.9.0",
+  "nyc": {
+    "exclude": [
+      "test",
+      "__tests__",
+      "node_modules",
+      "target"
+    ]
+  }
+}

diff --git a/ui/pom.xml b/ui/pom.xml
new file mode 100644
index 0000000..c9e4c68
--- /dev/null
+++ b/ui/pom.xml
@@ -0,0 +1,142 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.thingsboard</groupId>
+        <version>0.0.1-SNAPSHOT</version>
+        <artifactId>server</artifactId>
+    </parent>
+    <groupId>org.thingsboard.server</groupId>
+    <artifactId>ui</artifactId>
+    <packaging>jar</packaging>
+
+    <name>Thingsboard Server UI</name>
+    <url>http://thingsboard.org</url>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <main.dir>${basedir}/..</main.dir>
+    </properties>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${project.build.directory}/generated-resources</directory>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>com.github.eirslett</groupId>
+                <artifactId>frontend-maven-plugin</artifactId>
+                <version>1.0</version>
+                <configuration>
+                    <installDirectory>target</installDirectory>
+                    <workingDirectory>${basedir}</workingDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>install node and npm</id>
+                        <goals>
+                            <goal>install-node-and-npm</goal>
+                        </goals>
+                        <configuration>
+                            <nodeVersion>v6.9.1</nodeVersion>
+                            <npmVersion>3.10.8</npmVersion>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>npm install</id>
+                        <goals>
+                            <goal>npm</goal>
+                        </goals>
+                        <configuration>
+                            <arguments>install</arguments>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    <profiles>
+        <profile>
+            <id>npm-build</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <version>1.0</version>
+                        <configuration>
+                            <installDirectory>target</installDirectory>
+                            <workingDirectory>${basedir}</workingDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>npm build</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+                                <configuration>
+                                    <arguments>run build</arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+        <profile>
+            <id>npm-start</id>
+            <activation>
+                <property>
+                    <name>npm-start</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>com.github.eirslett</groupId>
+                        <artifactId>frontend-maven-plugin</artifactId>
+                        <version>1.0</version>
+                        <configuration>
+                            <installDirectory>target</installDirectory>
+                            <workingDirectory>${basedir}</workingDirectory>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>npm start</id>
+                                <goals>
+                                    <goal>npm</goal>
+                                </goals>
+
+                                <configuration>
+                                    <arguments>start</arguments>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+</project>

diff --git a/ui/server.js b/ui/server.js
new file mode 100644
index 0000000..842eb9c
--- /dev/null
+++ b/ui/server.js
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-commonjs */
+/* eslint-disable global-require */
+/* eslint-disable import/no-nodejs-modules */
+
+const path = require('path');
+const webpack = require('webpack');
+const historyApiFallback = require("connect-history-api-fallback");
+const webpackDevMiddleware = require('webpack-dev-middleware');
+const webpackHotMiddleware = require('webpack-hot-middleware');
+const config = require('./webpack.config');
+
+const express = require('express');
+const http = require('http');
+const httpProxy = require('http-proxy');
+const forwardHost = 'localhost';
+const forwardPort = 8080;
+
+const app = express();
+const server = http.createServer(app);
+
+const PORT = 3000;
+
+const compiler = webpack(config);
+
+app.use(historyApiFallback());
+app.use(webpackDevMiddleware(compiler, {noInfo: true, publicPath: config.output.publicPath}));
+app.use(webpackHotMiddleware(compiler));
+
+const root = path.join(__dirname, '/src');
+
+app.use('/static', express.static(root));
+
+const apiProxy = httpProxy.createProxyServer({
+    target: {
+        host: forwardHost,
+        port: forwardPort
+    }
+});
+
+console.info(`Forwarding API requests to http://${forwardHost}:${forwardPort}`);
+
+app.all('/api/*', (req, res) => {
+    apiProxy.web(req, res);
+});
+
+app.get('*', function(req, res) {
+    res.sendFile(path.join(__dirname, 'src/index.html'));
+});
+
+server.on('upgrade', (req, socket, head) => {
+    apiProxy.ws(req, socket, head);
+});
+
+server.listen(PORT, '0.0.0.0', (error) => {
+    if (error) {
+        console.error(error);
+    } else {
+        console.info(`==> 🌎  Listening on port ${PORT}. Open up http://localhost:${PORT}/ in your browser.`);
+    }
+});

diff --git a/ui/src/app/admin/admin.controller.js b/ui/src/app/admin/admin.controller.js
new file mode 100644
index 0000000..f59ae80
--- /dev/null
+++ b/ui/src/app/admin/admin.controller.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*@ngInject*/
+export default function AdminController(adminService, toast, $scope, $rootScope, $state, $translate) {
+
+    var vm = this;
+    vm.save = save;
+    vm.sendTestMail = sendTestMail;
+    vm.smtpProtocols = ('smtp smtps').split(' ').map(function (protocol) {
+        return protocol;
+    });
+
+    $translate('admin.test-mail-sent').then(function (translation) {
+        vm.testMailSent = translation;
+    }, function (translationId) {
+        vm.testMailSent = translationId;
+    });
+
+
+    loadSettings();
+
+    function loadSettings() {
+        adminService.getAdminSettings($state.$current.data.key).then(function success(settings) {
+            vm.settings = settings;
+        });
+    }
+
+    function save() {
+        adminService.saveAdminSettings(vm.settings).then(function success(settings) {
+            vm.settings = settings;
+            vm.settingsForm.$setPristine();
+        });
+    }
+
+    function sendTestMail() {
+        adminService.sendTestMail(vm.settings).then(function success() {
+            toast.showSuccess($translate.instant('admin.test-mail-sent'));
+        });
+    }
+
+}

diff --git a/ui/src/app/admin/admin.routes.js b/ui/src/app/admin/admin.routes.js
new file mode 100644
index 0000000..8f7c71a
--- /dev/null
+++ b/ui/src/app/admin/admin.routes.js
@@ -0,0 +1,73 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import generalSettingsTemplate from '../admin/general-settings.tpl.html';
+import outgoingMailSettingsTemplate from '../admin/outgoing-mail-settings.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function AdminRoutes($stateProvider) {
+    $stateProvider
+        .state('home.settings', {
+            url: '/settings',
+            module: 'private',
+            auth: ['SYS_ADMIN'],
+            redirectTo: 'home.settings.general',
+            ncyBreadcrumb: {
+                label: '{"icon": "settings", "label": "admin.system-settings"}'
+            }
+        })
+        .state('home.settings.general', {
+            url: '/general',
+            module: 'private',
+            auth: ['SYS_ADMIN'],
+            views: {
+                "content@home": {
+                    templateUrl: generalSettingsTemplate,
+                    controllerAs: 'vm',
+                    controller: 'AdminController'
+                }
+            },
+            data: {
+                key: 'general',
+                pageTitle: 'admin.general-settings'
+            },
+            ncyBreadcrumb: {
+                label: '{"icon": "settings_applications", "label": "admin.general"}'
+            }
+        })
+        .state('home.settings.outgoing-mail', {
+            url: '/outgoing-mail',
+            module: 'private',
+            auth: ['SYS_ADMIN'],
+            views: {
+                "content@home": {
+                    templateUrl: outgoingMailSettingsTemplate,
+                    controllerAs: 'vm',
+                    controller: 'AdminController'
+                }
+            },
+            data: {
+                key: 'mail',
+                pageTitle: 'admin.outgoing-mail-settings'
+            },
+            ncyBreadcrumb: {
+                label: '{"icon": "mail", "label": "admin.outgoing-mail"}'
+            }
+        });
+}

diff --git a/ui/src/app/admin/general-settings.tpl.html b/ui/src/app/admin/general-settings.tpl.html
new file mode 100644
index 0000000..70cbfcf
--- /dev/null
+++ b/ui/src/app/admin/general-settings.tpl.html
@@ -0,0 +1,45 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div layout="row" width="100%" layout-wrap> 
+	<md-card flex-gt-sm="60" flex="100" >
+       <md-card-title>
+          <md-card-title-text>
+           		<span translate class="md-headline">admin.general-settings</span>
+          </md-card-title-text>
+        </md-card-title>	
+   	    <md-progress-linear md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+  	    <span style="min-height: 5px;" flex="" ng-show="!loading"></span>
+        <md-card-content>	        
+			<form name="vm.settingsForm" ng-submit="vm.save()" tb-confirm-on-exit confirm-form="vm.settingsForm">
+				<fieldset ng-disabled="loading">
+					<md-input-container class="md-block">
+						<label translate>admin.base-url</label>
+						<input required name="baseUrl" ng-model="vm.settings.jsonValue.baseUrl">
+						<div ng-messages="vm.settingsForm.baseUrl.$error">
+	         					<div translate ng-message="required">admin.base-url-required</div>
+	       				</div>				
+					</md-input-container>
+					<div layout="row" layout-align="end center" width="100%" layout-wrap>
+						<md-button ng-disabled="loading || vm.settingsForm.$invalid || !vm.settingsForm.$dirty" type="submit" class="md-raised md-primary">{{'action.save' | translate}}</md-button>
+					</div>
+				</fieldset>
+			</form>
+		</md-card-content> 
+	</md-card>
+</div>
+

diff --git a/ui/src/app/admin/index.js b/ui/src/app/admin/index.js
new file mode 100644
index 0000000..087d912
--- /dev/null
+++ b/ui/src/app/admin/index.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import uiRouter from 'angular-ui-router';
+import ngMaterial from 'angular-material';
+import ngMessages from 'angular-messages';
+import thingsboardApiAdmin from '../api/admin.service';
+import thingsboardConfirmOnExit from '../components/confirm-on-exit.directive';
+import thingsboardToast from '../services/toast';
+
+import AdminRoutes from './admin.routes';
+import AdminController from './admin.controller';
+
+export default angular.module('thingsboard.admin', [
+    uiRouter,
+    ngMaterial,
+    ngMessages,
+    thingsboardApiAdmin,
+    thingsboardConfirmOnExit,
+    thingsboardToast
+])
+    .config(AdminRoutes)
+    .controller('AdminController', AdminController)
+    .name;

diff --git a/ui/src/app/admin/outgoing-mail-settings.tpl.html b/ui/src/app/admin/outgoing-mail-settings.tpl.html
new file mode 100644
index 0000000..6e0914f
--- /dev/null
+++ b/ui/src/app/admin/outgoing-mail-settings.tpl.html
@@ -0,0 +1,99 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div layout="row" width="100%" layout-wrap tb-help="'outgoingMailSettings'" help-container-id="help-container">
+	<md-card flex-gt-sm="60" flex="100" >
+       <md-card-title>
+          <md-card-title-text layout="row">
+           	  <span translate class="md-headline">admin.outgoing-mail-settings</span>
+			  <span flex></span>
+			  <div id="help-container"></div>
+          </md-card-title-text>
+        </md-card-title>	
+   	    <md-progress-linear md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+  	    <span style="min-height: 5px;" flex="" ng-show="!loading"></span>
+        <md-card-content>	        		
+			<form name="vm.settingsForm" ng-submit="vm.save()" tb-confirm-on-exit confirm-form="vm.settingsForm">
+				<fieldset ng-disabled="loading">
+					<md-input-container class="md-block">
+						<label translate>admin.mail-from</label>
+						<input required name="mailFrom" ng-model="vm.settings.jsonValue.mailFrom">
+						<div ng-messages="vm.settingsForm.mailFrom.$error">
+	         					<div translate ng-message="required">admin.mail-from-required</div>
+	       				</div>				
+					</md-input-container>
+					<md-input-container class="md-block">
+						<label translate>admin.smtp-protocol</label>
+			            <md-select ng-disabled="loading" ng-model="vm.settings.jsonValue.smtpProtocol">
+			              	<md-option ng-repeat="smtpProtocol in vm.smtpProtocols" value="{{smtpProtocol}}">
+			                	{{smtpProtocol.toUpperCase()}}
+			             	 </md-option>
+			            </md-select>
+					</md-input-container>	
+					<div layout-gt-sm="row">
+						<md-input-container class="md-block" flex="100" flex-gt-sm="60">
+							<label translate>admin.smtp-host</label>
+							<input required name="smtpHost" ng-model="vm.settings.jsonValue.smtpHost"
+								   placeholder="localhost">	
+							<div ng-messages="vm.settingsForm.smtpHost.$error">
+		         					<div translate ng-message="required">admin.smtp-host-required</div>
+		       				</div>				
+						</md-input-container>	
+						<md-input-container class="md-block" flex="100" flex-gt-sm="40">
+							<label translate>admin.smtp-port</label>
+							<input required name="smtpPort" ng-model="vm.settings.jsonValue.smtpPort"
+									placeholder="25" 
+									ng-pattern="/^([0-9]{1,4}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/"
+									md-maxlength="5">	
+				            <div ng-messages="vm.settingsForm.smtpPort.$error" role="alert" multiple>
+				              <div translate ng-message="required">admin.smtp-port-required</div>
+				              <div translate ng-message="pattern">admin.smtp-port-invalid</div>
+				              <div translate ng-message="md-maxlength">admin.smtp-port-invalid</div>
+				            </div>	
+						</md-input-container>						
+					</div>						
+					<md-input-container class="md-block">
+						<label translate>admin.timeout-msec</label>
+						<input required name="timeout" ng-model="vm.settings.jsonValue.timeout"
+							   placeholder="10000" 
+							   ng-pattern="/^[0-9]{1,6}$/"
+							   md-maxlength="6">	
+						<div ng-messages="vm.settingsForm.timeout.$error" role="alert" multiple>
+	         				  <div translate ng-message="required">admin.timeout-required</div>
+				              <div translate ng-message="pattern">admin.timeout-invalid</div>
+				              <div translate ng-message="md-maxlength">admin.timeout-invalid</div>
+	       				</div>				
+					</md-input-container>	
+					<md-checkbox ng-disabled="loading" ng-true-value="'true'" ng-false-value="'false'"
+								 aria-label="{{ 'admin.enable-tls' | translate }}" ng-model="vm.settings.jsonValue.enableTls">{{ 'admin.enable-tls' | translate }}</md-checkbox>
+					<md-input-container class="md-block">
+						<label translate>common.username</label>
+						<input name="username" placeholder="{{ 'common.enter-username' | translate }}" ng-model="vm.settings.jsonValue.username">
+					</md-input-container>				
+					<md-input-container class="md-block">
+						<label translate>common.password</label>
+						<input name="password" placeholder="{{ 'common.enter-password' | translate }}" type="password" ng-model="vm.settings.jsonValue.password">
+					</md-input-container>				
+					<div layout="row" layout-align="end center" width="100%" layout-wrap>
+						<md-button ng-disabled="loading || vm.settingsForm.$invalid" ng-click="vm.sendTestMail()" class="md-raised">{{'admin.send-test-mail' | translate}}</md-button>
+						<md-button ng-disabled="loading || vm.settingsForm.$invalid || !vm.settingsForm.$dirty" type="submit" class="md-raised md-primary">{{'action.save' | translate}}</md-button>
+					</div>
+				</fieldset>
+			</form>
+	    </md-card-content>
+    </md-card>
+</div>

diff --git a/ui/src/app/api/admin.service.js b/ui/src/app/api/admin.service.js
new file mode 100644
index 0000000..e49a017
--- /dev/null
+++ b/ui/src/app/api/admin.service.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.admin', [])
+    .factory('adminService', AdminService)
+    .name;
+
+/*@ngInject*/
+function AdminService($http, $q) {
+
+    var service = {
+        getAdminSettings: getAdminSettings,
+        saveAdminSettings: saveAdminSettings,
+        sendTestMail: sendTestMail
+    }
+
+    return service;
+
+    function getAdminSettings(key) {
+        var deferred = $q.defer();
+        var url = '/api/admin/settings/' + key;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function saveAdminSettings(settings) {
+        var deferred = $q.defer();
+        var url = '/api/admin/settings';
+        $http.post(url, settings).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function sendTestMail(settings) {
+        var deferred = $q.defer();
+        var url = '/api/admin/settings/testMail';
+        $http.post(url, settings).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+}

diff --git a/ui/src/app/api/component-descriptor.service.js b/ui/src/app/api/component-descriptor.service.js
new file mode 100644
index 0000000..7f108ff
--- /dev/null
+++ b/ui/src/app/api/component-descriptor.service.js
@@ -0,0 +1,87 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.componentDescriptor', [])
+    .factory('componentDescriptorService', ComponentDescriptorService).name;
+
+/*@ngInject*/
+function ComponentDescriptorService($http, $q) {
+
+    var componentsByType = {};
+    var componentsByClazz = {};
+    var actionsByPlugin = {};
+
+    var service = {
+        getComponentDescriptorsByType: getComponentDescriptorsByType,
+        getComponentDescriptorByClazz: getComponentDescriptorByClazz,
+        getPluginActionsByPluginClazz: getPluginActionsByPluginClazz
+    }
+
+    return service;
+
+    function getComponentDescriptorsByType(componentType) {
+        var deferred = $q.defer();
+        if (componentsByType[componentType]) {
+            deferred.resolve(componentsByType[componentType]);
+        } else {
+            var url = '/api/components/' + componentType;
+            $http.get(url, null).then(function success(response) {
+                componentsByType[componentType] = response.data;
+                for (var i = 0; i < componentsByType[componentType].length; i++) {
+                    var component = componentsByType[componentType][i];
+                    componentsByClazz[component.clazz] = component;
+                }
+                deferred.resolve(componentsByType[componentType]);
+            }, function fail() {
+                deferred.reject();
+            });
+
+        }
+        return deferred.promise;
+    }
+
+    function getComponentDescriptorByClazz(componentDescriptorClazz) {
+        var deferred = $q.defer();
+        if (componentsByClazz[componentDescriptorClazz]) {
+            deferred.resolve(componentsByClazz[componentDescriptorClazz]);
+        } else {
+            var url = '/api/component/' + componentDescriptorClazz;
+            $http.get(url, null).then(function success(response) {
+                componentsByClazz[componentDescriptorClazz] = response.data;
+                deferred.resolve(componentsByClazz[componentDescriptorClazz]);
+            }, function fail() {
+                deferred.reject();
+            });
+        }
+        return deferred.promise;
+    }
+
+    function getPluginActionsByPluginClazz(pluginClazz) {
+        var deferred = $q.defer();
+        if (actionsByPlugin[pluginClazz]) {
+            deferred.resolve(actionsByPlugin[pluginClazz]);
+        } else {
+            var url = '/api/components/actions/' + pluginClazz;
+            $http.get(url, null).then(function success(response) {
+                actionsByPlugin[pluginClazz] = response.data;
+                deferred.resolve(actionsByPlugin[pluginClazz]);
+            }, function fail() {
+                deferred.reject();
+            });
+        }
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/customer.service.js b/ui/src/app/api/customer.service.js
new file mode 100644
index 0000000..b6570ef
--- /dev/null
+++ b/ui/src/app/api/customer.service.js
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.customer', [])
+    .factory('customerService', CustomerService)
+    .name;
+
+/*@ngInject*/
+function CustomerService($http, $q) {
+
+    var service = {
+        getCustomers: getCustomers,
+        getCustomer: getCustomer,
+        deleteCustomer: deleteCustomer,
+        saveCustomer: saveCustomer
+    }
+
+    return service;
+
+    function getCustomers(pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/customers?limit=' + pageLink.limit;
+        if (angular.isDefined(pageLink.textSearch)) {
+            url += '&textSearch=' + pageLink.textSearch;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&idOffset=' + pageLink.idOffset;
+        }
+        if (angular.isDefined(pageLink.textOffset)) {
+            url += '&textOffset=' + pageLink.textOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getCustomer(customerId) {
+        var deferred = $q.defer();
+        var url = '/api/customer/' + customerId;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function saveCustomer(customer) {
+        var deferred = $q.defer();
+        var url = '/api/customer';
+        $http.post(url, customer).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function deleteCustomer(customerId) {
+        var deferred = $q.defer();
+        var url = '/api/customer/' + customerId;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/dashboard.service.js b/ui/src/app/api/dashboard.service.js
new file mode 100644
index 0000000..3709fc8
--- /dev/null
+++ b/ui/src/app/api/dashboard.service.js
@@ -0,0 +1,129 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.dashboard', [])
+    .factory('dashboardService', DashboardService).name;
+
+/*@ngInject*/
+function DashboardService($http, $q) {
+
+    var service = {
+        assignDashboardToCustomer: assignDashboardToCustomer,
+        getCustomerDashboards: getCustomerDashboards,
+        getDashboard: getDashboard,
+        getTenantDashboards: getTenantDashboards,
+        deleteDashboard: deleteDashboard,
+        saveDashboard: saveDashboard,
+        unassignDashboardFromCustomer: unassignDashboardFromCustomer
+    }
+
+    return service;
+
+    function getTenantDashboards(pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/tenant/dashboards?limit=' + pageLink.limit;
+        if (angular.isDefined(pageLink.textSearch)) {
+            url += '&textSearch=' + pageLink.textSearch;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&idOffset=' + pageLink.idOffset;
+        }
+        if (angular.isDefined(pageLink.textOffset)) {
+            url += '&textOffset=' + pageLink.textOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getCustomerDashboards(customerId, pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/customer/' + customerId + '/dashboards?limit=' + pageLink.limit;
+        if (angular.isDefined(pageLink.textSearch)) {
+            url += '&textSearch=' + pageLink.textSearch;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&idOffset=' + pageLink.idOffset;
+        }
+        if (angular.isDefined(pageLink.textOffset)) {
+            url += '&textOffset=' + pageLink.textOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getDashboard(dashboardId) {
+        var deferred = $q.defer();
+        var url = '/api/dashboard/' + dashboardId;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function saveDashboard(dashboard) {
+        var deferred = $q.defer();
+        var url = '/api/dashboard';
+        $http.post(url, dashboard).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function deleteDashboard(dashboardId) {
+        var deferred = $q.defer();
+        var url = '/api/dashboard/' + dashboardId;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function assignDashboardToCustomer(customerId, dashboardId) {
+        var deferred = $q.defer();
+        var url = '/api/customer/' + customerId + '/dashboard/' + dashboardId;
+        $http.post(url, null).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function unassignDashboardFromCustomer(dashboardId) {
+        var deferred = $q.defer();
+        var url = '/api/customer/dashboard/' + dashboardId;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/datasource.service.js b/ui/src/app/api/datasource.service.js
new file mode 100644
index 0000000..495b555
--- /dev/null
+++ b/ui/src/app/api/datasource.service.js
@@ -0,0 +1,490 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import thingsboardApiDevice from './device.service';
+import thingsboardApiTelemetryWebsocket from './telemetry-websocket.service';
+import thingsboardTypes from '../common/types.constant';
+import thingsboardUtils from '../common/utils.service';
+
+export default angular.module('thingsboard.api.datasource', [thingsboardApiDevice, thingsboardApiTelemetryWebsocket, thingsboardTypes, thingsboardUtils])
+    .factory('datasourceService', DatasourceService)
+    .name;
+
+/*@ngInject*/
+function DatasourceService($timeout, $log, telemetryWebsocketService, types, utils) {
+
+    var subscriptions = {};
+
+    var service = {
+        subscribeToDatasource: subscribeToDatasource,
+        unsubscribeFromDatasource: unsubscribeFromDatasource
+    }
+
+    return service;
+
+
+    function subscribeToDatasource(listener) {
+        var datasource = listener.datasource;
+
+        if (datasource.type === types.datasourceType.device && !listener.deviceId) {
+            return;
+        }
+
+        var subscriptionDataKeys = [];
+        for (var d in datasource.dataKeys) {
+            var dataKey = datasource.dataKeys[d];
+            var subscriptionDataKey = {
+                name: dataKey.name,
+                type: dataKey.type,
+                funcBody: dataKey.funcBody,
+                postFuncBody: dataKey.postFuncBody
+            }
+            subscriptionDataKeys.push(subscriptionDataKey);
+        }
+
+        var datasourceSubscription = {
+            datasourceType: datasource.type,
+            dataKeys: subscriptionDataKeys,
+            type: listener.widget.type
+        };
+
+        if (listener.widget.type === types.widgetType.timeseries.value) {
+            datasourceSubscription.subscriptionTimewindow = listener.subscriptionTimewindow;
+        }
+        if (datasourceSubscription.datasourceType === types.datasourceType.device) {
+            datasourceSubscription.deviceId = listener.deviceId;
+        }
+
+        listener.datasourceSubscriptionKey = utils.objectHashCode(datasourceSubscription);
+        var subscription;
+        if (subscriptions[listener.datasourceSubscriptionKey]) {
+            subscription = subscriptions[listener.datasourceSubscriptionKey];
+            subscription.syncListener(listener);
+        } else {
+            subscription = new DatasourceSubscription(datasourceSubscription, telemetryWebsocketService, $timeout, $log, types, utils);
+            subscriptions[listener.datasourceSubscriptionKey] = subscription;
+            subscription.start();
+        }
+        subscription.addListener(listener);
+    }
+
+    function unsubscribeFromDatasource(listener) {
+        if (listener.datasourceSubscriptionKey) {
+            if (subscriptions[listener.datasourceSubscriptionKey]) {
+                var subscription = subscriptions[listener.datasourceSubscriptionKey];
+                subscription.removeListener(listener);
+                if (!subscription.hasListeners()) {
+                    subscription.unsubscribe();
+                    delete subscriptions[listener.datasourceSubscriptionKey];
+                }
+            }
+            listener.datasourceSubscriptionKey = null;
+        }
+    }
+
+}
+
+function DatasourceSubscription(datasourceSubscription, telemetryWebsocketService, $timeout, $log, types, utils) {
+
+    var listeners = [];
+    var datasourceType = datasourceSubscription.datasourceType;
+    var datasourceData = {};
+    var dataKeys = {};
+    var subscribers = {};
+    var history = datasourceSubscription.subscriptionTimewindow &&
+        datasourceSubscription.subscriptionTimewindow.fixedWindow;
+    var realtime = datasourceSubscription.subscriptionTimewindow &&
+        datasourceSubscription.subscriptionTimewindow.realtimeWindowMs;
+    var dataGenFunction = null;
+    var timer;
+    var frequency;
+
+    var subscription = {
+        addListener: addListener,
+        hasListeners: hasListeners,
+        removeListener: removeListener,
+        syncListener: syncListener,
+        start: start,
+        unsubscribe: unsubscribe
+    }
+
+    initializeSubscription();
+
+    return subscription;
+
+    function initializeSubscription() {
+        for (var i = 0; i < datasourceSubscription.dataKeys.length; i++) {
+            var dataKey = angular.copy(datasourceSubscription.dataKeys[i]);
+            dataKey.index = i;
+            var key;
+            if (datasourceType === types.datasourceType.function) {
+                key = utils.objectHashCode(dataKey);
+                if (!dataKey.func) {
+                    dataKey.func = new Function("time", "prevValue", dataKey.funcBody);
+                }
+                datasourceData[key] = [];
+                dataKeys[key] = dataKey;
+            } else if (datasourceType === types.datasourceType.device) {
+                key = dataKey.name + '_' + dataKey.type;
+                if (dataKey.postFuncBody && !dataKey.postFunc) {
+                    dataKey.postFunc = new Function("time", "value", "prevValue", dataKey.postFuncBody);
+                }
+                var dataKeysList = dataKeys[key];
+                if (!dataKeysList) {
+                    dataKeysList = [];
+                    dataKeys[key] = dataKeysList;
+                }
+                var index = dataKeysList.push(dataKey) - 1;
+                datasourceData[key + '_' + index] = [];
+            }
+            dataKey.key = key;
+        }
+        if (datasourceType === types.datasourceType.function) {
+            frequency = 1000;
+            if (datasourceSubscription.type === types.widgetType.timeseries.value) {
+                dataGenFunction = generateSeries;
+                var window;
+                if (realtime) {
+                    window = datasourceSubscription.subscriptionTimewindow.realtimeWindowMs;
+                } else {
+                    window = datasourceSubscription.subscriptionTimewindow.fixedWindow.endTimeMs -
+                        datasourceSubscription.subscriptionTimewindow.fixedWindow.startTimeMs;
+                }
+                frequency = window / 1000 * 5;
+            } else if (datasourceSubscription.type === types.widgetType.latest.value) {
+                dataGenFunction = generateLatest;
+                frequency = 1000;
+            }
+        }
+    }
+
+    function addListener(listener) {
+        listeners.push(listener);
+        if (history) {
+            start();
+        }
+    }
+
+    function hasListeners() {
+        return listeners.length > 0;
+    }
+
+    function removeListener(listener) {
+        listeners.splice(listeners.indexOf(listener), 1);
+    }
+
+    function syncListener(listener) {
+        var key;
+        var dataKey;
+        if (datasourceType === types.datasourceType.function) {
+            for (key in dataKeys) {
+                dataKey = dataKeys[key];
+                listener.dataUpdated(datasourceData[key],
+                    listener.datasourceIndex,
+                    dataKey.index);
+            }
+        } else if (datasourceType === types.datasourceType.device) {
+            for (key in dataKeys) {
+                var dataKeysList = dataKeys[key];
+                for (var i = 0; i < dataKeysList.length; i++) {
+                    dataKey = dataKeysList[i];
+                    var datasourceKey = key + '_' + i;
+                    listener.dataUpdated(datasourceData[datasourceKey],
+                        listener.datasourceIndex,
+                        dataKey.index);
+                }
+            }
+        }
+    }
+
+    function start() {
+        if (history && !hasListeners()) {
+            return;
+        }
+        //$log.debug("started!");
+        if (datasourceType === types.datasourceType.device) {
+
+            //send subscribe command
+
+            var tsKeys = '';
+            var attrKeys = '';
+
+            for (var key in dataKeys) {
+                var dataKeysList = dataKeys[key];
+                var dataKey = dataKeysList[0];
+                if (dataKey.type === types.dataKeyType.timeseries) {
+                    if (tsKeys.length > 0) {
+                        tsKeys += ',';
+                    }
+                    tsKeys += dataKey.name;
+                } else if (dataKey.type === types.dataKeyType.attribute) {
+                    if (attrKeys.length > 0) {
+                        attrKeys += ',';
+                    }
+                    attrKeys += dataKey.name;
+                }
+            }
+
+            if (tsKeys.length > 0) {
+
+                var subscriber;
+                var subscriptionCommand;
+
+                if (history) {
+
+                    var historyCommand = {
+                        deviceId: datasourceSubscription.deviceId,
+                        keys: tsKeys,
+                        startTs: datasourceSubscription.subscriptionTimewindow.fixedWindow.startTimeMs,
+                        endTs: datasourceSubscription.subscriptionTimewindow.fixedWindow.endTimeMs
+                    };
+
+                    subscriber = {
+                        historyCommand: historyCommand,
+                        type: types.dataKeyType.timeseries,
+                        onData: function (data) {
+                            onData(data, types.dataKeyType.timeseries);
+                        }
+                    };
+
+                    telemetryWebsocketService.subscribe(subscriber);
+                    subscribers[subscriber.historyCommand.cmdId] = subscriber;
+
+                } else {
+
+                    subscriptionCommand = {
+                        deviceId: datasourceSubscription.deviceId,
+                        keys: tsKeys
+                    };
+
+                    if (datasourceSubscription.type === types.widgetType.timeseries.value) {
+                        subscriptionCommand.timeWindow = datasourceSubscription.subscriptionTimewindow.realtimeWindowMs;
+                    }
+
+                    subscriber = {
+                        subscriptionCommand: subscriptionCommand,
+                        type: types.dataKeyType.timeseries,
+                        onData: function (data) {
+                            onData(data, types.dataKeyType.timeseries);
+                        }
+                    };
+
+                    telemetryWebsocketService.subscribe(subscriber);
+                    subscribers[subscriber.subscriptionCommand.cmdId] = subscriber;
+
+                }
+            }
+
+            if (attrKeys.length > 0) {
+
+                subscriptionCommand = {
+                    deviceId: datasourceSubscription.deviceId,
+                    keys: attrKeys
+                };
+
+                subscriber = {
+                    subscriptionCommand: subscriptionCommand,
+                    type: types.dataKeyType.attribute,
+                    onData: function (data) {
+                        onData(data, types.dataKeyType.attribute);
+                    }
+                };
+
+                telemetryWebsocketService.subscribe(subscriber);
+                subscribers[subscriber.cmdId] = subscriber;
+
+            }
+
+        } else if (dataGenFunction) {
+            if (history) {
+                onTick();
+            } else {
+                timer = $timeout(onTick, 0, false);
+            }
+        }
+
+    }
+
+    function unsubscribe() {
+        if (timer) {
+            $timeout.cancel(timer);
+        }
+        if (datasourceType === types.datasourceType.device) {
+            for (var cmdId in subscribers) {
+                telemetryWebsocketService.unsubscribe(subscribers[cmdId]);
+            }
+            subscribers = {};
+        }
+        //$log.debug("unsibscribed!");
+    }
+
+    function boundToInterval(data, timewindowMs) {
+        if (data.length > 1) {
+            var start = data[0][0];
+            var end = data[data.length - 1][0];
+            var i = 0;
+            var currentInterval = end - start;
+            while (currentInterval > timewindowMs && i < data.length - 2) {
+                i++;
+                start = data[i][0];
+                currentInterval = end - start;
+            }
+            if (i > 1) {
+                data.splice(0, i - 1);
+            }
+        }
+        return data;
+    }
+
+    function generateSeries(dataKey) {
+
+        var data = [];
+        var startTime;
+        var endTime;
+
+        if (realtime) {
+            endTime = (new Date).getTime();
+            if (dataKey.lastUpdateTime) {
+                startTime = dataKey.lastUpdateTime + frequency;
+            } else {
+                startTime = endTime - datasourceSubscription.subscriptionTimewindow.realtimeWindowMs;
+            }
+        } else {
+            startTime = datasourceSubscription.subscriptionTimewindow.fixedWindow.startTimeMs;
+            endTime = datasourceSubscription.subscriptionTimewindow.fixedWindow.endTimeMs;
+        }
+        var prevSeries;
+        var datasourceKeyData = datasourceData[dataKey.key];
+        if (datasourceKeyData.length > 0) {
+            prevSeries = datasourceKeyData[datasourceKeyData.length - 1];
+        } else {
+            prevSeries = [0, 0];
+        }
+        for (var time = startTime; time <= endTime; time += frequency) {
+            var series = [];
+            series.push(time);
+            var value = dataKey.func(time, prevSeries[1]);
+            series.push(value);
+            data.push(series);
+            prevSeries = series;
+        }
+        if (data.length > 0) {
+            dataKey.lastUpdateTime = data[data.length - 1][0];
+        }
+        if (realtime) {
+            datasourceData[dataKey.key] = boundToInterval(datasourceKeyData.concat(data),
+                datasourceSubscription.subscriptionTimewindow.realtimeWindowMs);
+        } else {
+            datasourceData[dataKey.key] = data;
+        }
+        for (var i in listeners) {
+            var listener = listeners[i];
+            listener.dataUpdated(datasourceData[dataKey.key],
+                listener.datasourceIndex,
+                dataKey.index);
+        }
+    }
+
+    function generateLatest(dataKey) {
+        var prevSeries;
+        var datasourceKeyData = datasourceData[dataKey.key];
+        if (datasourceKeyData.length > 0) {
+            prevSeries = datasourceKeyData[datasourceKeyData.length - 1];
+        } else {
+            prevSeries = [0, 0];
+        }
+        var series = [];
+        var time = (new Date).getTime();
+        series.push(time);
+        var value = dataKey.func(time, prevSeries[1]);
+        series.push(value);
+        datasourceData[dataKey.key] = [series];
+        for (var i in listeners) {
+            var listener = listeners[i];
+            listener.dataUpdated(datasourceData[dataKey.key],
+                listener.datasourceIndex,
+                dataKey.index);
+        }
+    }
+
+    function onTick() {
+        for (var key in dataKeys) {
+            dataGenFunction(dataKeys[key]);
+        }
+        if (!history) {
+            timer = $timeout(onTick, frequency / 2, false);
+        }
+    }
+
+    function onData(sourceData, type) {
+        for (var keyName in sourceData) {
+            var keyData = sourceData[keyName];
+            var key = keyName + '_' + type;
+            var dataKeyList = dataKeys[key];
+            for (var keyIndex = 0; keyIndex < dataKeyList.length; keyIndex++) {
+                var datasourceKey = key + "_" + keyIndex;
+                if (datasourceData[datasourceKey]) {
+                    var dataKey = dataKeyList[keyIndex];
+                    var data = [];
+                    var prevSeries;
+                    var datasourceKeyData = datasourceData[datasourceKey];
+                    if (datasourceKeyData.length > 0) {
+                        prevSeries = datasourceKeyData[datasourceKeyData.length - 1];
+                    } else {
+                        prevSeries = [0, 0];
+                    }
+                    if (datasourceSubscription.type === types.widgetType.timeseries.value) {
+                        var series, time, value;
+                        for (var i in keyData) {
+                            series = keyData[i];
+                            time = series[0];
+                            value = Number(series[1]);
+                            if (dataKey.postFunc) {
+                                value = dataKey.postFunc(time, value, prevSeries[1]);
+                            }
+                            series = [time, value];
+                            data.push(series);
+                            prevSeries = series;
+                        }
+                    } else if (datasourceSubscription.type === types.widgetType.latest.value) {
+                        if (keyData.length > 0) {
+                            series = keyData[0];
+                            time = series[0];
+                            value = series[1];
+                            if (dataKey.postFunc) {
+                                value = dataKey.postFunc(time, value, prevSeries[1]);
+                            }
+                            series = [time, value];
+                            data.push(series);
+                        }
+                    }
+                    if (data.length > 0) {
+                        if (realtime) {
+                            datasourceData[datasourceKey] = boundToInterval(datasourceKeyData.concat(data), datasourceSubscription.subscriptionTimewindow.realtimeWindowMs);
+                        } else {
+                            datasourceData[datasourceKey] = data;
+                        }
+                        for (var i2 in listeners) {
+                            var listener = listeners[i2];
+                            listener.dataUpdated(datasourceData[datasourceKey],
+                                listener.datasourceIndex,
+                                dataKey.index);
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

diff --git a/ui/src/app/api/device.service.js b/ui/src/app/api/device.service.js
new file mode 100644
index 0000000..cf38d12
--- /dev/null
+++ b/ui/src/app/api/device.service.js
@@ -0,0 +1,381 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import thingsboardTypes from '../common/types.constant';
+
+export default angular.module('thingsboard.api.device', [thingsboardTypes])
+    .factory('deviceService', DeviceService)
+    .name;
+
+/*@ngInject*/
+function DeviceService($http, $q, $filter, telemetryWebsocketService, types) {
+
+
+    var deviceAttributesSubscriptionMap = {};
+
+    var service = {
+        assignDeviceToCustomer: assignDeviceToCustomer,
+        deleteDevice: deleteDevice,
+        getCustomerDevices: getCustomerDevices,
+        getDevice: getDevice,
+        getDeviceCredentials: getDeviceCredentials,
+        getDeviceKeys: getDeviceKeys,
+        getDeviceTimeseriesValues: getDeviceTimeseriesValues,
+        getTenantDevices: getTenantDevices,
+        saveDevice: saveDevice,
+        saveDeviceCredentials: saveDeviceCredentials,
+        unassignDeviceFromCustomer: unassignDeviceFromCustomer,
+        getDeviceAttributes: getDeviceAttributes,
+        subscribeForDeviceAttributes: subscribeForDeviceAttributes,
+        unsubscribeForDeviceAttributes: unsubscribeForDeviceAttributes,
+        saveDeviceAttributes: saveDeviceAttributes,
+        deleteDeviceAttributes: deleteDeviceAttributes,
+        sendOneWayRpcCommand: sendOneWayRpcCommand,
+        sendTwoWayRpcCommand: sendTwoWayRpcCommand
+    }
+
+    return service;
+
+    function getTenantDevices(pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/tenant/devices?limit=' + pageLink.limit;
+        if (angular.isDefined(pageLink.textSearch)) {
+            url += '&textSearch=' + pageLink.textSearch;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&idOffset=' + pageLink.idOffset;
+        }
+        if (angular.isDefined(pageLink.textOffset)) {
+            url += '&textOffset=' + pageLink.textOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getCustomerDevices(customerId, pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/customer/' + customerId + '/devices?limit=' + pageLink.limit;
+        if (angular.isDefined(pageLink.textSearch)) {
+            url += '&textSearch=' + pageLink.textSearch;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&idOffset=' + pageLink.idOffset;
+        }
+        if (angular.isDefined(pageLink.textOffset)) {
+            url += '&textOffset=' + pageLink.textOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getDevice(deviceId) {
+        var deferred = $q.defer();
+        var url = '/api/device/' + deviceId;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function saveDevice(device) {
+        var deferred = $q.defer();
+        var url = '/api/device';
+        $http.post(url, device).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function deleteDevice(deviceId) {
+        var deferred = $q.defer();
+        var url = '/api/device/' + deviceId;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function getDeviceCredentials(deviceId) {
+        var deferred = $q.defer();
+        var url = '/api/device/' + deviceId + '/credentials';
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function saveDeviceCredentials(deviceCredentials) {
+        var deferred = $q.defer();
+        var url = '/api/device/credentials';
+        $http.post(url, deviceCredentials).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function assignDeviceToCustomer(customerId, deviceId) {
+        var deferred = $q.defer();
+        var url = '/api/customer/' + customerId + '/device/' + deviceId;
+        $http.post(url, null).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function unassignDeviceFromCustomer(deviceId) {
+        var deferred = $q.defer();
+        var url = '/api/customer/device/' + deviceId;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function getDeviceKeys(deviceId, query, type) {
+        var deferred = $q.defer();
+        var url = '/api/plugins/telemetry/' + deviceId + '/keys/';
+        if (type === types.dataKeyType.timeseries) {
+            url += 'timeseries';
+        } else if (type === types.dataKeyType.attribute) {
+            url += 'attributes';
+        }
+        $http.get(url, null).then(function success(response) {
+            var result = [];
+            if (response.data) {
+                if (query) {
+                    var dataKeys = response.data;
+                    var lowercaseQuery = angular.lowercase(query);
+                    for (var i in dataKeys) {
+                        if (angular.lowercase(dataKeys[i]).indexOf(lowercaseQuery) === 0) {
+                            result.push(dataKeys[i]);
+                        }
+                    }
+                } else {
+                    result = response.data;
+                }
+            }
+            deferred.resolve(result);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function getDeviceTimeseriesValues(deviceId, keys, startTs, endTs, limit) {
+        var deferred = $q.defer();
+        var url = '/api/plugins/telemetry/' + deviceId + '/values/timeseries';
+        url += '?keys=' + keys;
+        url += '&startTs=' + startTs;
+        url += '&endTs=' + endTs;
+        if (angular.isDefined(limit)) {
+            url += '&limit=' + limit;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function processDeviceAttributes(attributes, query, deferred, successCallback, update) {
+        attributes = $filter('orderBy')(attributes, query.order);
+        if (query.search != null) {
+            attributes = $filter('filter')(attributes, {key: query.search});
+        }
+        var responseData = {
+            count: attributes.length
+        }
+        var startIndex = query.limit * (query.page - 1);
+        responseData.data = attributes.slice(startIndex, startIndex + query.limit);
+        successCallback(responseData, update);
+        if (deferred) {
+            deferred.resolve();
+        }
+    }
+
+    function getDeviceAttributes(deviceId, attributeScope, query, successCallback) {
+        var deferred = $q.defer();
+        var subscriptionId = deviceId + attributeScope;
+        var das = deviceAttributesSubscriptionMap[subscriptionId];
+        if (das) {
+            if (das.attributes) {
+                processDeviceAttributes(das.attributes, query, deferred, successCallback);
+                das.subscriptionCallback = function(attributes) {
+                    processDeviceAttributes(attributes, query, null, successCallback, true);
+                }
+            } else {
+                das.subscriptionCallback = function(attributes) {
+                    processDeviceAttributes(attributes, query, deferred, successCallback);
+                    das.subscriptionCallback = function(attributes) {
+                        processDeviceAttributes(attributes, query, null, successCallback, true);
+                    }
+                }
+            }
+        } else {
+            var url = '/api/plugins/telemetry/' + deviceId + '/values/attributes/' + attributeScope;
+            $http.get(url, null).then(function success(response) {
+                processDeviceAttributes(response.data, query, deferred, successCallback);
+            }, function fail() {
+                deferred.reject();
+            });
+        }
+        return deferred;
+    }
+
+    function onSubscriptionData(data, subscriptionId) {
+        var deviceAttributesSubscription = deviceAttributesSubscriptionMap[subscriptionId];
+        if (deviceAttributesSubscription) {
+            if (!deviceAttributesSubscription.attributes) {
+                deviceAttributesSubscription.attributes = [];
+                deviceAttributesSubscription.keys = {};
+            }
+            var attributes = deviceAttributesSubscription.attributes;
+            var keys = deviceAttributesSubscription.keys;
+            for (var key in data) {
+                var index = keys[key];
+                var attribute;
+                if (index > -1) {
+                    attribute = attributes[index];
+                } else {
+                    attribute = {
+                        key: key
+                    };
+                    index = attributes.push(attribute)-1;
+                    keys[key] = index;
+                }
+                var attrData = data[key][0];
+                attribute.lastUpdateTs = attrData[0];
+                attribute.value = attrData[1];
+            }
+            if (deviceAttributesSubscription.subscriptionCallback) {
+                deviceAttributesSubscription.subscriptionCallback(attributes);
+            }
+        }
+    }
+
+    function subscribeForDeviceAttributes(deviceId, attributeScope) {
+        var subscriptionId = deviceId + attributeScope;
+        var deviceAttributesSubscription = deviceAttributesSubscriptionMap[subscriptionId];
+        if (!deviceAttributesSubscription) {
+            var subscriptionCommand = {
+                deviceId: deviceId
+            };
+
+            var type = attributeScope === types.latestTelemetry.value ?
+                types.dataKeyType.timeseries : types.dataKeyType.attribute;
+
+            var subscriber = {
+                subscriptionCommand: subscriptionCommand,
+                type: type,
+                onData: function (data) {
+                    onSubscriptionData(data, subscriptionId);
+                }
+            };
+            telemetryWebsocketService.subscribe(subscriber);
+            deviceAttributesSubscription = {
+                subscriber: subscriber,
+                attributes: null
+            }
+            deviceAttributesSubscriptionMap[subscriptionId] = deviceAttributesSubscription;
+        }
+        return subscriptionId;
+    }
+    function unsubscribeForDeviceAttributes(subscriptionId) {
+        var deviceAttributesSubscription = deviceAttributesSubscriptionMap[subscriptionId];
+        if (deviceAttributesSubscription) {
+            telemetryWebsocketService.unsubscribe(deviceAttributesSubscription.subscriber);
+            delete deviceAttributesSubscriptionMap[subscriptionId];
+        }
+    }
+
+    function saveDeviceAttributes(deviceId, attributeScope, attributes) {
+        var deferred = $q.defer();
+        var attributesData = {};
+        for (var a in attributes) {
+            attributesData[attributes[a].key] = attributes[a].value;
+        }
+        var url = '/api/plugins/telemetry/' + deviceId + '/' + attributeScope;
+        $http.post(url, attributesData).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function deleteDeviceAttributes(deviceId, attributeScope, attributes) {
+        var deferred = $q.defer();
+        var keys = '';
+        for (var i = 0; i < attributes.length; i++) {
+            if (i > 0) {
+                keys += ',';
+            }
+            keys += attributes[i].key;
+        }
+        var url = '/api/plugins/telemetry/' + deviceId + '/' + attributeScope + '?keys=' + keys;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function sendOneWayRpcCommand(deviceId, requestBody) {
+        var deferred = $q.defer();
+        var url = '/api/plugins/rpc/oneway/' + deviceId;
+        $http.post(url, requestBody).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(rejection) {
+            deferred.reject(rejection);
+        });
+        return deferred.promise;
+    }
+
+    function sendTwoWayRpcCommand(deviceId, requestBody) {
+        var deferred = $q.defer();
+        var url = '/api/plugins/rpc/twoway/' + deviceId;
+        $http.post(url, requestBody).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(rejection) {
+            deferred.reject(rejection);
+        });
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/event.service.js b/ui/src/app/api/event.service.js
new file mode 100644
index 0000000..39074e0
--- /dev/null
+++ b/ui/src/app/api/event.service.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.event', [])
+    .factory('eventService', EventService)
+    .name;
+
+/*@ngInject*/
+function EventService($http, $q) {
+
+    var service = {
+        getEvents: getEvents
+    }
+
+    return service;
+
+    function getEvents (entityType, entityId, eventType, tenantId, pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/events/'+entityType+'/'+entityId+'/'+eventType+'?tenantId=' + tenantId + '&limit=' + pageLink.limit;
+
+        if (angular.isDefined(pageLink.startTime)) {
+            url += '&startTime=' + pageLink.startTime;
+        }
+        if (angular.isDefined(pageLink.endTime)) {
+            url += '&endTime=' + pageLink.endTime;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&offset=' + pageLink.idOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/login.service.js b/ui/src/app/api/login.service.js
new file mode 100644
index 0000000..e904e43
--- /dev/null
+++ b/ui/src/app/api/login.service.js
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.login', [])
+    .factory('loginService', LoginService)
+    .name;
+
+/*@ngInject*/
+function LoginService($http, $q) {
+
+    var service = {
+        activate: activate,
+        changePassword: changePassword,
+        hasUser: hasUser,
+        login: login,
+        resetPassword: resetPassword,
+        sendResetPasswordLink: sendResetPasswordLink,
+    }
+
+    return service;
+
+    function hasUser() {
+        return true;
+    }
+
+    function login(user) {
+        var deferred = $q.defer();
+        var loginRequest = {
+            username: user.name,
+            password: user.password
+        };
+        $http.post('/api/auth/login', loginRequest).then(function success(response) {
+            deferred.resolve(response);
+        }, function fail(response) {
+            deferred.reject(response);
+        });
+        return deferred.promise;
+    }
+
+    function sendResetPasswordLink(email) {
+        var deferred = $q.defer();
+        var url = '/api/noauth/resetPasswordByEmail?email=' + email;
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function resetPassword(resetToken, password) {
+        var deferred = $q.defer();
+        var url = '/api/noauth/resetPassword?resetToken=' + resetToken + '&password=' + password;
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function activate(activateToken, password) {
+        var deferred = $q.defer();
+        var url = '/api/noauth/activate?activateToken=' + activateToken + '&password=' + password;
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function changePassword(currentPassword, newPassword) {
+        var deferred = $q.defer();
+        var url = '/api/auth/changePassword?currentPassword=' + currentPassword + '&newPassword=' + newPassword;
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+}

diff --git a/ui/src/app/api/plugin.service.js b/ui/src/app/api/plugin.service.js
new file mode 100644
index 0000000..83a99a6
--- /dev/null
+++ b/ui/src/app/api/plugin.service.js
@@ -0,0 +1,216 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.plugin', [])
+    .factory('pluginService', PluginService).name;
+
+/*@ngInject*/
+function PluginService($http, $q, $rootScope, $filter, componentDescriptorService, types, utils) {
+
+    var allPlugins = undefined;
+    var allActionPlugins = undefined;
+    var systemPlugins = undefined;
+    var tenantPlugins = undefined;
+
+    $rootScope.pluginServiceStateChangeStartHandle = $rootScope.$on('$stateChangeStart', function () {
+        invalidatePluginsCache();
+    });
+
+    var service = {
+        getSystemPlugins: getSystemPlugins,
+        getTenantPlugins: getTenantPlugins,
+        getAllPlugins: getAllPlugins,
+        getAllActionPlugins: getAllActionPlugins,
+        getPluginByToken: getPluginByToken,
+        getPlugin: getPlugin,
+        deletePlugin: deletePlugin,
+        savePlugin: savePlugin,
+        activatePlugin: activatePlugin,
+        suspendPlugin: suspendPlugin
+    }
+
+    return service;
+
+    function invalidatePluginsCache() {
+        allPlugins = undefined;
+        allActionPlugins = undefined;
+        systemPlugins = undefined;
+        tenantPlugins = undefined;
+    }
+
+    function loadPluginsCache() {
+        var deferred = $q.defer();
+        if (!allPlugins) {
+            var url = '/api/plugins';
+            $http.get(url, null).then(function success(response) {
+                componentDescriptorService.getComponentDescriptorsByType(types.componentType.plugin).then(
+                    function success(pluginComponents) {
+                        allPlugins = response.data;
+                        allActionPlugins = [];
+                        systemPlugins = [];
+                        tenantPlugins = [];
+                        allPlugins = $filter('orderBy')(allPlugins, ['+name', '-createdTime']);
+                        var pluginHasActionsByClazz = {};
+                        for (var index in pluginComponents) {
+                            pluginHasActionsByClazz[pluginComponents[index].clazz] =
+                                (pluginComponents[index].actions != null && pluginComponents[index].actions.length > 0);
+                        }
+                        for (var i = 0; i < allPlugins.length; i++) {
+                            var plugin = allPlugins[i];
+                            if (pluginHasActionsByClazz[plugin.clazz] === true) {
+                                allActionPlugins.push(plugin);
+                            }
+                            if (plugin.tenantId.id === types.id.nullUid) {
+                                systemPlugins.push(plugin);
+                            } else {
+                                tenantPlugins.push(plugin);
+                            }
+                        }
+                        deferred.resolve();
+                    },
+                    function fail() {
+                        deferred.reject();
+                    }
+                );
+            }, function fail() {
+                deferred.reject();
+            });
+        } else {
+            deferred.resolve();
+        }
+        return deferred.promise;
+    }
+
+    function getSystemPlugins(pageLink) {
+        var deferred = $q.defer();
+        loadPluginsCache().then(
+            function success() {
+                utils.filterSearchTextEntities(systemPlugins, 'name', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getTenantPlugins(pageLink) {
+        var deferred = $q.defer();
+        loadPluginsCache().then(
+            function success() {
+                utils.filterSearchTextEntities(tenantPlugins, 'name', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getAllActionPlugins(pageLink) {
+        var deferred = $q.defer();
+        loadPluginsCache().then(
+            function success() {
+                utils.filterSearchTextEntities(allActionPlugins, 'name', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getAllPlugins(pageLink) {
+        var deferred = $q.defer();
+        loadPluginsCache().then(
+            function success() {
+                utils.filterSearchTextEntities(allPlugins, 'name', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getPluginByToken(pluginToken) {
+        var deferred = $q.defer();
+        var url = '/api/plugin/token/' + pluginToken;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getPlugin(pluginId) {
+        var deferred = $q.defer();
+        var url = '/api/plugin/' + pluginId;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function savePlugin(plugin) {
+        var deferred = $q.defer();
+        var url = '/api/plugin';
+        $http.post(url, plugin).then(function success(response) {
+            invalidatePluginsCache();
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function deletePlugin(pluginId) {
+        var deferred = $q.defer();
+        var url = '/api/plugin/' + pluginId;
+        $http.delete(url).then(function success() {
+            invalidatePluginsCache();
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function activatePlugin(pluginId) {
+        var deferred = $q.defer();
+        var url = '/api/plugin/' + pluginId + '/activate';
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function suspendPlugin(pluginId) {
+        var deferred = $q.defer();
+        var url = '/api/plugin/' + pluginId + '/suspend';
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/rule.service.js b/ui/src/app/api/rule.service.js
new file mode 100644
index 0000000..b27f405
--- /dev/null
+++ b/ui/src/app/api/rule.service.js
@@ -0,0 +1,182 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.rule', [])
+    .factory('ruleService', RuleService).name;
+
+/*@ngInject*/
+function RuleService($http, $q, $rootScope, $filter, types, utils) {
+
+    var allRules = undefined;
+    var systemRules = undefined;
+    var tenantRules = undefined;
+
+    $rootScope.ruleServiceStateChangeStartHandle = $rootScope.$on('$stateChangeStart', function () {
+        invalidateRulesCache();
+    });
+
+    var service = {
+        getSystemRules: getSystemRules,
+        getTenantRules: getTenantRules,
+        getAllRules: getAllRules,
+        getRulesByPluginToken: getRulesByPluginToken,
+        getRule: getRule,
+        deleteRule: deleteRule,
+        saveRule: saveRule,
+        activateRule: activateRule,
+        suspendRule: suspendRule
+    }
+
+    return service;
+
+    function invalidateRulesCache() {
+        allRules = undefined;
+        systemRules = undefined;
+        tenantRules = undefined;
+    }
+
+    function loadRulesCache() {
+        var deferred = $q.defer();
+        if (!allRules) {
+            var url = '/api/rules';
+            $http.get(url, null).then(function success(response) {
+                allRules = response.data;
+                systemRules = [];
+                tenantRules = [];
+                allRules = $filter('orderBy')(allRules, ['+name', '-createdTime']);
+                for (var i = 0; i < allRules.length; i++) {
+                    var rule = allRules[i];
+                    if (rule.tenantId.id === types.id.nullUid) {
+                        systemRules.push(rule);
+                    } else {
+                        tenantRules.push(rule);
+                    }
+                }
+                deferred.resolve();
+            }, function fail() {
+                deferred.reject();
+            });
+        } else {
+            deferred.resolve();
+        }
+        return deferred.promise;
+    }
+
+    function getSystemRules(pageLink) {
+        var deferred = $q.defer();
+        loadRulesCache().then(
+            function success() {
+                utils.filterSearchTextEntities(systemRules, 'name', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getTenantRules(pageLink) {
+        var deferred = $q.defer();
+        loadRulesCache().then(
+            function success() {
+                utils.filterSearchTextEntities(tenantRules, 'name', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getAllRules(pageLink) {
+        var deferred = $q.defer();
+        loadRulesCache().then(
+            function success() {
+                utils.filterSearchTextEntities(allRules, 'name', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getRulesByPluginToken(pluginToken) {
+        var deferred = $q.defer();
+        var url = '/api/rule/token/' + pluginToken;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getRule(ruleId) {
+        var deferred = $q.defer();
+        var url = '/api/rule/' + ruleId;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function saveRule(rule) {
+        var deferred = $q.defer();
+        var url = '/api/rule';
+        $http.post(url, rule).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function deleteRule(ruleId) {
+        var deferred = $q.defer();
+        var url = '/api/rule/' + ruleId;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function activateRule(ruleId) {
+        var deferred = $q.defer();
+        var url = '/api/rule/' + ruleId + '/activate';
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function suspendRule(ruleId) {
+        var deferred = $q.defer();
+        var url = '/api/rule/' + ruleId + '/suspend';
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/telemetry-websocket.service.js b/ui/src/app/api/telemetry-websocket.service.js
new file mode 100644
index 0000000..f7e35eb
--- /dev/null
+++ b/ui/src/app/api/telemetry-websocket.service.js
@@ -0,0 +1,170 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import 'angular-websocket';
+import thingsboardTypes from '../common/types.constant';
+
+export default angular.module('thingsboard.api.telemetryWebsocket', [thingsboardTypes])
+    .factory('telemetryWebsocketService', TelemetryWebsocketService)
+    .name;
+
+/*@ngInject*/
+function TelemetryWebsocketService($log, $websocket, $timeout, $window, types, userService) {
+
+    var isOpening = false,
+        isOpened = false,
+        lastCmdId = 0,
+        subscribers = {},
+        subscribersCount = 0,
+        cmdsWrapper = {
+            tsSubCmds: [],
+            historyCmds: [],
+            attrSubCmds: []
+        },
+        telemetryUri,
+        dataStream,
+        location = $window.location,
+        socketCloseTimer;
+
+    if (location.protocol === "https:") {
+        telemetryUri = "wss:";
+    } else {
+        telemetryUri = "ws:";
+    }
+    telemetryUri += "//" + location.hostname + ":" + location.port;
+    telemetryUri += "/api/ws/plugins/telemetry";
+
+    var service = {
+        subscribe: subscribe,
+        unsubscribe: unsubscribe
+    }
+
+    return service;
+
+    function publishCommands () {
+        if (isOpened && (cmdsWrapper.tsSubCmds.length > 0 ||
+            cmdsWrapper.historyCmds.length > 0 ||
+            cmdsWrapper.attrSubCmds.length > 0)) {
+            $log.debug("Sending subscription commands!");
+            dataStream.send(angular.copy(cmdsWrapper)).then(function () {
+                $log.debug("Subscription commands were sent!");
+                checkToClose();
+            });
+            cmdsWrapper.tsSubCmds = [];
+            cmdsWrapper.historyCmds = [];
+            cmdsWrapper.attrSubCmds = [];
+        }
+        tryOpenSocket();
+    }
+
+    function onError (message) {
+        $log.debug("Websocket error:");
+        $log.debug(message);
+        isOpening = false;
+    }
+
+    function onOpen () {
+        $log.debug("Websocket opened");
+        isOpening = false;
+        isOpened = true;
+        publishCommands();
+    }
+
+    function onClose () {
+        $log.debug("Websocket closed");
+        isOpening = false;
+        isOpened = false;
+    }
+
+    function onMessage (message) {
+        if (message.data) {
+            var data = angular.fromJson(message.data);
+            if (data.subscriptionId) {
+                var subscriber = subscribers[data.subscriptionId];
+                if (subscriber && data.data) {
+                    subscriber.onData(data.data);
+                }
+            }
+        }
+        checkToClose();
+    }
+
+    function nextCmdId () {
+        lastCmdId++;
+        return lastCmdId;
+    }
+
+    function subscribe (subscriber) {
+        var cmdId = nextCmdId();
+        subscribers[cmdId] = subscriber;
+        subscribersCount++;
+        if (angular.isDefined(subscriber.subscriptionCommand)) {
+            subscriber.subscriptionCommand.cmdId = cmdId;
+            if (subscriber.type === types.dataKeyType.timeseries) {
+                cmdsWrapper.tsSubCmds.push(subscriber.subscriptionCommand);
+            } else if (subscriber.type === types.dataKeyType.attribute) {
+                cmdsWrapper.attrSubCmds.push(subscriber.subscriptionCommand);
+            }
+        } else if (angular.isDefined(subscriber.historyCommand)) {
+            subscriber.historyCommand.cmdId = cmdId;
+            cmdsWrapper.historyCmds.push(subscriber.historyCommand);
+        }
+        publishCommands();
+    }
+
+    function unsubscribe (subscriber) {
+        if (subscriber.subscriptionCommand) {
+            subscriber.subscriptionCommand.unsubscribe = true;
+            if (subscriber.type === types.dataKeyType.timeseries) {
+                cmdsWrapper.tsSubCmds.push(subscriber.subscriptionCommand);
+            } else if (subscriber.type === types.dataKeyType.attribute) {
+                cmdsWrapper.attrSubCmds.push(subscriber.subscriptionCommand);
+            }
+            delete subscribers[subscriber.subscriptionCommand.cmdId];
+        } else if (subscriber.historyCommand) {
+            delete subscribers[subscriber.historyCommand.cmdId];
+        }
+        subscribersCount--;
+        publishCommands();
+    }
+
+    function checkToClose () {
+        if (subscribersCount === 0 && isOpened) {
+            if (!socketCloseTimer) {
+                socketCloseTimer = $timeout(closeSocket, 90000, false);
+            }
+        }
+    }
+
+    function tryOpenSocket () {
+        if (!isOpened && !isOpening) {
+            isOpening = true;
+            dataStream = $websocket(telemetryUri + '?token=' + userService.getJwtToken());
+            dataStream.onError(onError);
+            dataStream.onOpen(onOpen);
+            dataStream.onClose(onClose);
+            dataStream.onMessage(onMessage);
+        }
+        if (socketCloseTimer) {
+            $timeout.cancel(socketCloseTimer);
+        }
+    }
+
+    function closeSocket() {
+        if (isOpened) {
+            dataStream.close();
+        }
+    }
+}

diff --git a/ui/src/app/api/tenant.service.js b/ui/src/app/api/tenant.service.js
new file mode 100644
index 0000000..ab87038
--- /dev/null
+++ b/ui/src/app/api/tenant.service.js
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.api.tenant', [])
+    .factory('tenantService', TenantService)
+    .name;
+
+/*@ngInject*/
+function TenantService($http, $q) {
+
+    var service = {
+        deleteTenant: deleteTenant,
+        getTenant: getTenant,
+        getTenants: getTenants,
+        saveTenant: saveTenant,
+    }
+
+    return service;
+
+    function getTenants (pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/tenants?limit=' + pageLink.limit;
+        if (angular.isDefined(pageLink.textSearch)) {
+            url += '&textSearch=' + pageLink.textSearch;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&idOffset=' + pageLink.idOffset;
+        }
+        if (angular.isDefined(pageLink.textOffset)) {
+            url += '&textOffset=' + pageLink.textOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getTenant (tenantId) {
+        var deferred = $q.defer();
+        var url = '/api/tenant/' + tenantId;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function saveTenant (tenant) {
+        var deferred = $q.defer();
+        var url = '/api/tenant';
+        $http.post(url, tenant).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function deleteTenant (tenantId) {
+        var deferred = $q.defer();
+        var url = '/api/tenant/' + tenantId;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/user.service.js b/ui/src/app/api/user.service.js
new file mode 100644
index 0000000..ee679c6
--- /dev/null
+++ b/ui/src/app/api/user.service.js
@@ -0,0 +1,334 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import thingsboardApiLogin  from './login.service';
+import angularStorage from 'angular-storage';
+
+export default angular.module('thingsboard.api.user', [thingsboardApiLogin,
+    angularStorage])
+    .factory('userService', UserService)
+    .name;
+
+/*@ngInject*/
+function UserService($http, $q, $rootScope, store, jwtHelper, $translate) {
+    var currentUser = null,
+        userLoaded = false;
+
+    var refreshTokenQueue = [];
+
+    var service = {
+        deleteUser: deleteUser,
+        getAuthority: getAuthority,
+        isAuthenticated: isAuthenticated,
+        getCurrentUser: getCurrentUser,
+        getCustomerUsers: getCustomerUsers,
+        getUser: getUser,
+        getTenantAdmins: getTenantAdmins,
+        isUserLoaded: isUserLoaded,
+        saveUser: saveUser,
+        sendActivationEmail: sendActivationEmail,
+        setUserFromJwtToken: setUserFromJwtToken,
+        getJwtToken: getJwtToken,
+        clearJwtToken: clearJwtToken,
+        isJwtTokenValid : isJwtTokenValid,
+        validateJwtToken: validateJwtToken,
+        refreshJwtToken: refreshJwtToken,
+        refreshTokenPending: refreshTokenPending,
+        updateAuthorizationHeader: updateAuthorizationHeader,
+        logout: logout
+    }
+
+    loadUser(true).then(function success() {
+        notifyUserLoaded();
+    }, function fail() {
+        notifyUserLoaded();
+    });
+
+    return service;
+
+    function updateAndValidateToken(token, prefix) {
+        var valid = false;
+        var tokenData = jwtHelper.decodeToken(token);
+        var issuedAt = tokenData.iat;
+        var expTime = tokenData.exp;
+        if (issuedAt && expTime) {
+            var ttl = expTime - issuedAt;
+            if (ttl > 0) {
+                var clientExpiration = new Date().valueOf() + ttl*1000;
+                store.set(prefix, token);
+                store.set(prefix + '_expiration', clientExpiration);
+                valid = true;
+            }
+        }
+        if (!valid) {
+            $rootScope.$broadcast('unauthenticated');
+        }
+    }
+
+    function clearTokenData() {
+        store.remove('jwt_token');
+        store.remove('jwt_token_expiration');
+        store.remove('refresh_token');
+        store.remove('refresh_token_expiration');
+    }
+
+    function setUserFromJwtToken(jwtToken, refreshToken, notify, doLogout) {
+        currentUser = null;
+        if (!jwtToken) {
+            clearTokenData();
+            if (notify) {
+                $rootScope.$broadcast('unauthenticated', doLogout);
+            }
+        } else {
+            updateAndValidateToken(jwtToken, 'jwt_token');
+            updateAndValidateToken(refreshToken, 'refresh_token');
+            if (notify) {
+                loadUser(false).then(function success() {
+                    $rootScope.$broadcast('authenticated');
+                }, function fail() {
+                    $rootScope.$broadcast('unauthenticated');
+                });
+            } else {
+                loadUser(false);
+            }
+        }
+    }
+
+    function isAuthenticated() {
+        return store.get('jwt_token');
+    }
+
+    function getJwtToken() {
+        return store.get('jwt_token');
+    }
+
+    function logout() {
+        clearJwtToken(true);
+    }
+
+    function clearJwtToken(doLogout) {
+        setUserFromJwtToken(null, null, true, doLogout);
+    }
+
+    function isJwtTokenValid() {
+        return isTokenValid('jwt_token');
+    }
+
+    function isTokenValid(prefix) {
+        var clientExpiration = store.get(prefix + '_expiration');
+        return clientExpiration && clientExpiration > new Date().valueOf();
+    }
+
+    function validateJwtToken(doRefresh) {
+        var deferred = $q.defer();
+        if (!isTokenValid('jwt_token')) {
+            if (doRefresh) {
+                refreshJwtToken().then(function success() {
+                    deferred.resolve();
+                }, function fail() {
+                    deferred.reject();
+                });
+            } else {
+                clearJwtToken(false);
+                deferred.reject();
+            }
+        } else {
+            deferred.resolve();
+        }
+        return deferred.promise;
+    }
+
+    function resolveRefreshTokenQueue(data) {
+        for (var q in refreshTokenQueue) {
+            refreshTokenQueue[q].resolve(data);
+        }
+        refreshTokenQueue = [];
+    }
+
+    function rejectRefreshTokenQueue(message) {
+        for (var q in refreshTokenQueue) {
+            refreshTokenQueue[q].reject(message);
+        }
+        refreshTokenQueue = [];
+    }
+
+    function refreshTokenPending() {
+        return refreshTokenQueue.length > 0;
+    }
+
+    function refreshJwtToken() {
+        var deferred = $q.defer();
+        refreshTokenQueue.push(deferred);
+        if (refreshTokenQueue.length === 1) {
+            var refreshToken = store.get('refresh_token');
+            var refreshTokenValid = isTokenValid('refresh_token');
+            setUserFromJwtToken(null, null, false, false);
+            if (!refreshTokenValid) {
+                rejectRefreshTokenQueue($translate.instant('access.refresh-token-expired'));
+            } else {
+                var refreshTokenRequest = {
+                    refreshToken: refreshToken
+                };
+                $http.post('/api/auth/token', refreshTokenRequest).then(function success(response) {
+                    var token = response.data.token;
+                    var refreshToken = response.data.refreshToken;
+                    setUserFromJwtToken(token, refreshToken, false);
+                    resolveRefreshTokenQueue(response.data);
+                }, function fail() {
+                    clearJwtToken(false);
+                    rejectRefreshTokenQueue($translate.instant('access.refresh-token-failed'));
+                });
+            }
+        }
+        return deferred.promise;
+    }
+
+    function getCurrentUser() {
+        return currentUser;
+    }
+
+    function getAuthority() {
+        if (currentUser) {
+            return currentUser.authority;
+        } else {
+            return '';
+        }
+    }
+
+    function isUserLoaded() {
+        return userLoaded;
+    }
+
+    function loadUser(doTokenRefresh) {
+        var deferred = $q.defer();
+        if (!currentUser) {
+            validateJwtToken(doTokenRefresh).then(function success() {
+                var jwtToken = store.get('jwt_token');
+                currentUser = jwtHelper.decodeToken(jwtToken);
+                if (currentUser && currentUser.scopes && currentUser.scopes.length > 0) {
+                    currentUser.authority = currentUser.scopes[0];
+                } else if (currentUser) {
+                    currentUser.authority = "ANONYMOUS";
+                }
+                deferred.resolve();
+            }, function fail() {
+                deferred.reject();
+            });
+        } else {
+            deferred.resolve();
+        }
+        return deferred.promise;
+    }
+
+    function notifyUserLoaded() {
+        if (!userLoaded) {
+            userLoaded = true;
+            $rootScope.$broadcast('userLoaded');
+        }
+    }
+
+    function updateAuthorizationHeader(headers) {
+        var jwtToken = store.get('jwt_token');
+        if (jwtToken) {
+            headers['X-Authorization'] = 'Bearer ' + jwtToken;
+        }
+        return jwtToken;
+    }
+
+    function getTenantAdmins(tenantId, pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/tenant/' + tenantId + '/users?limit=' + pageLink.limit;
+        if (angular.isDefined(pageLink.textSearch)) {
+            url += '&textSearch=' + pageLink.textSearch;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&idOffset=' + pageLink.idOffset;
+        }
+        if (angular.isDefined(pageLink.textOffset)) {
+            url += '&textOffset=' + pageLink.textOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getCustomerUsers(customerId, pageLink) {
+        var deferred = $q.defer();
+        var url = '/api/customer/' + customerId + '/users?limit=' + pageLink.limit;
+        if (angular.isDefined(pageLink.textSearch)) {
+            url += '&textSearch=' + pageLink.textSearch;
+        }
+        if (angular.isDefined(pageLink.idOffset)) {
+            url += '&idOffset=' + pageLink.idOffset;
+        }
+        if (angular.isDefined(pageLink.textOffset)) {
+            url += '&textOffset=' + pageLink.textOffset;
+        }
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function saveUser(user) {
+        var deferred = $q.defer();
+        var url = '/api/user';
+        $http.post(url, user).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function getUser(userId) {
+        var deferred = $q.defer();
+        var url = '/api/user/' + userId;
+        $http.get(url).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function deleteUser(userId) {
+        var deferred = $q.defer();
+        var url = '/api/user/' + userId;
+        $http.delete(url).then(function success() {
+            deferred.resolve();
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function sendActivationEmail(email) {
+        var deferred = $q.defer();
+        var url = '/api/user/sendActivationMail?email=' + email;
+        $http.post(url, null).then(function success(response) {
+            deferred.resolve(response);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/api/widget.service.js b/ui/src/app/api/widget.service.js
new file mode 100644
index 0000000..d7885b3
--- /dev/null
+++ b/ui/src/app/api/widget.service.js
@@ -0,0 +1,601 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import $ from 'jquery';
+import moment from 'moment';
+import tinycolor from 'tinycolor2';
+
+import thinsboardLedLight from '../components/led-light.directive';
+
+import TbAnalogueLinearGauge from '../widget/lib/analogue-linear-gauge';
+import TbAnalogueRadialGauge from '../widget/lib/analogue-radial-gauge';
+import TbDigitalGauge from '../widget/lib/digital-gauge';
+
+import 'oclazyload';
+import cssjs from '../../vendor/css.js/css';
+
+import thingsboardTypes from '../common/types.constant';
+import thingsboardUtils from '../common/utils.service';
+
+export default angular.module('thingsboard.api.widget', ['oc.lazyLoad', thinsboardLedLight, thingsboardTypes, thingsboardUtils])
+    .factory('widgetService', WidgetService)
+    .name;
+
+/*@ngInject*/
+function WidgetService($rootScope, $http, $q, $filter, $ocLazyLoad, $window, types, utils) {
+
+    $window.$ = $;
+    $window.moment = moment;
+    $window.tinycolor = tinycolor;
+    $window.lazyLoad = $ocLazyLoad;
+
+    $window.TbAnalogueLinearGauge = TbAnalogueLinearGauge;
+    $window.TbAnalogueRadialGauge = TbAnalogueRadialGauge;
+    $window.TbDigitalGauge = TbDigitalGauge;
+
+    var cssParser = new cssjs();
+    cssParser.testMode = false;
+
+    var missingWidgetType;
+    var errorWidgetType;
+
+    var editingWidgetType;
+
+    var widgetsInfoInMemoryCache = {};
+
+    var allWidgetsBundles = undefined;
+    var systemWidgetsBundles = undefined;
+    var tenantWidgetsBundles = undefined;
+
+    $rootScope.widgetServiceStateChangeStartHandle = $rootScope.$on('$stateChangeStart', function () {
+        invalidateWidgetsBundleCache();
+    });
+
+    initEditingWidgetType();
+    initWidgetPlaceholders();
+
+    var service = {
+        getWidgetTemplate: getWidgetTemplate,
+        getSystemWidgetsBundles: getSystemWidgetsBundles,
+        getTenantWidgetsBundles: getTenantWidgetsBundles,
+        getAllWidgetsBundles: getAllWidgetsBundles,
+        getSystemWidgetsBundlesByPageLink: getSystemWidgetsBundlesByPageLink,
+        getTenantWidgetsBundlesByPageLink: getTenantWidgetsBundlesByPageLink,
+        getAllWidgetsBundlesByPageLink: getAllWidgetsBundlesByPageLink,
+        getWidgetsBundleByAlias: getWidgetsBundleByAlias,
+        saveWidgetsBundle: saveWidgetsBundle,
+        getWidgetsBundle: getWidgetsBundle,
+        deleteWidgetsBundle: deleteWidgetsBundle,
+        getBundleWidgetTypes: getBundleWidgetTypes,
+        getWidgetInfo: getWidgetInfo,
+        getInstantWidgetInfo: getInstantWidgetInfo,
+        deleteWidgetType: deleteWidgetType,
+        saveWidgetType: saveWidgetType,
+        getWidgetType: getWidgetType,
+        getWidgetTypeById: getWidgetTypeById,
+        toWidgetInfo: toWidgetInfo
+    }
+
+    return service;
+
+    function initEditingWidgetType() {
+        if ($rootScope.widgetEditMode) {
+            editingWidgetType =
+                toWidgetType({
+                    widgetName: $rootScope.editWidgetInfo.widgetName,
+                    alias: 'customWidget',
+                    type: $rootScope.editWidgetInfo.type,
+                    sizeX: $rootScope.editWidgetInfo.sizeX,
+                    sizeY: $rootScope.editWidgetInfo.sizeY,
+                    resources: $rootScope.editWidgetInfo.resources,
+                    templateHtml: $rootScope.editWidgetInfo.templateHtml,
+                    templateCss: $rootScope.editWidgetInfo.templateCss,
+                    controllerScript: $rootScope.editWidgetInfo.controllerScript,
+                    settingsSchema: $rootScope.editWidgetInfo.settingsSchema,
+                    dataKeySettingsSchema: $rootScope.editWidgetInfo.dataKeySettingsSchema,
+                    defaultConfig: $rootScope.editWidgetInfo.defaultConfig
+            }, {id: '1'}, { id: types.id.nullUid }, 'customWidgetBundle');
+        }
+    }
+
+    function initWidgetPlaceholders() {
+
+        missingWidgetType = {
+            widgetName: 'Widget type not found',
+            alias: 'undefined',
+            sizeX: 8,
+            sizeY: 6,
+            resources: [],
+            templateHtml: '<div class="tb-widget-error-container"><div translate class="tb-widget-error-msg">widget.widget-type-not-found</div></div>',
+            templateCss: '',
+            controllerScript: 'fns.init = function(containerElement, settings, datasources,\n    data) {}\n\n\nfns.redraw = function(containerElement, width, height, data) {};',
+            settingsSchema: '{}\n',
+            dataKeySettingsSchema: '{}\n',
+            defaultConfig: '{\n' +
+            '"title": "Widget type not found",\n' +
+            '"datasources": [],\n' +
+            '"settings": {}\n' +
+            '}\n'
+        };
+
+        errorWidgetType = {
+            widgetName: 'Error loading widget',
+            alias: 'error',
+            sizeX: 8,
+            sizeY: 6,
+            resources: [],
+            templateHtml: '<div class="tb-widget-error-container"><div translate class="tb-widget-error-msg">widget.widget-type-load-error</div>',
+            templateCss: '',
+            controllerScript: 'fns.init = function(containerElement, settings, datasources,\n    data) {}\n\n\nfns.redraw = function(containerElement, width, height, data) {};',
+            settingsSchema: '{}\n',
+            dataKeySettingsSchema: '{}\n',
+            defaultConfig: '{\n' +
+            '"title": "Widget failed to load",\n' +
+            '"datasources": [],\n' +
+            '"settings": {}\n' +
+            '}\n'
+        };
+    }
+
+    function toWidgetInfo(widgetType) {
+
+        var widgetInfo = {
+            widgetName: widgetType.name,
+            alias: widgetType.alias
+        }
+
+        var descriptor = widgetType.descriptor;
+
+        widgetInfo.type = descriptor.type;
+        widgetInfo.sizeX = descriptor.sizeX;
+        widgetInfo.sizeY = descriptor.sizeY;
+        widgetInfo.resources = descriptor.resources;
+        widgetInfo.templateHtml = descriptor.templateHtml;
+        widgetInfo.templateCss = descriptor.templateCss;
+        widgetInfo.controllerScript = descriptor.controllerScript;
+        widgetInfo.settingsSchema = descriptor.settingsSchema;
+        widgetInfo.dataKeySettingsSchema = descriptor.dataKeySettingsSchema;
+        widgetInfo.defaultConfig = descriptor.defaultConfig;
+
+        return widgetInfo;
+    }
+
+    function toWidgetType(widgetInfo, id, tenantId, bundleAlias) {
+        var widgetType = {
+            id: id,
+            tenantId: tenantId,
+            bundleAlias: bundleAlias,
+            alias: widgetInfo.alias,
+            name: widgetInfo.widgetName
+        }
+
+        var descriptor = {
+            type: widgetInfo.type,
+            sizeX: widgetInfo.sizeX,
+            sizeY: widgetInfo.sizeY,
+            resources: widgetInfo.resources,
+            templateHtml: widgetInfo.templateHtml,
+            templateCss: widgetInfo.templateCss,
+            controllerScript: widgetInfo.controllerScript,
+            settingsSchema: widgetInfo.settingsSchema,
+            dataKeySettingsSchema: widgetInfo.dataKeySettingsSchema,
+            defaultConfig: widgetInfo.defaultConfig
+        }
+
+        widgetType.descriptor = descriptor;
+
+        return widgetType;
+    }
+
+    function getWidgetTemplate(type) {
+        var deferred = $q.defer();
+        var templateWidgetType = types.widgetType.timeseries;
+        for (var t in types.widgetType) {
+            var widgetType = types.widgetType[t];
+            if (widgetType.value === type) {
+                templateWidgetType = widgetType;
+                break;
+            }
+        }
+        getWidgetType(templateWidgetType.template.bundleAlias,
+                      templateWidgetType.template.alias, true).then(
+                          function success(widgetType) {
+                              var widgetInfo = toWidgetInfo(widgetType);
+                              widgetInfo.alias = undefined;
+                              deferred.resolve(widgetInfo);
+                          },
+                          function fail() {
+                              deferred.reject();
+                          }
+        );
+        return deferred.promise;
+    }
+
+    /** Cache functions **/
+
+    function getWidgetInfoFromCache(bundleAlias, widgetTypeAlias, isSystem) {
+        var key = (isSystem ? 'sys_' : '') + bundleAlias + '_' + widgetTypeAlias;
+        return widgetsInfoInMemoryCache[key];
+    }
+
+    function putWidgetInfoToCache(widgetInfo, bundleAlias, widgetTypeAlias, isSystem) {
+        var key = (isSystem ? 'sys_' : '') + bundleAlias + '_' + widgetTypeAlias;
+        widgetsInfoInMemoryCache[key] = widgetInfo;
+    }
+
+    function deleteWidgetInfoFromCache(bundleAlias, widgetTypeAlias, isSystem) {
+        var key = (isSystem ? 'sys_' : '') + bundleAlias + '_' + widgetTypeAlias;
+        delete widgetsInfoInMemoryCache[key];
+    }
+
+    function deleteWidgetsBundleFromCache(bundleAlias, isSystem) {
+        var key = (isSystem ? 'sys_' : '') + bundleAlias;
+        for (var cacheKey in widgetsInfoInMemoryCache) {
+            if (cacheKey.startsWith(key)) {
+                delete widgetsInfoInMemoryCache[cacheKey];
+            }
+        }
+    }
+
+    /** Bundle functions **/
+
+    function invalidateWidgetsBundleCache() {
+        allWidgetsBundles = undefined;
+        systemWidgetsBundles = undefined;
+        tenantWidgetsBundles = undefined;
+    }
+
+    function loadWidgetsBundleCache() {
+        var deferred = $q.defer();
+        if (!allWidgetsBundles) {
+            var url = '/api/widgetsBundles';
+            $http.get(url, null).then(function success(response) {
+                allWidgetsBundles = response.data;
+                systemWidgetsBundles = [];
+                tenantWidgetsBundles = [];
+                allWidgetsBundles = $filter('orderBy')(allWidgetsBundles, ['+title', '-createdTime']);
+                for (var i = 0; i < allWidgetsBundles.length; i++) {
+                    var widgetsBundle = allWidgetsBundles[i];
+                    if (widgetsBundle.tenantId.id === types.id.nullUid) {
+                        systemWidgetsBundles.push(widgetsBundle);
+                    } else {
+                        tenantWidgetsBundles.push(widgetsBundle);
+                    }
+                }
+                deferred.resolve();
+            }, function fail() {
+                deferred.reject();
+            });
+        } else {
+            deferred.resolve();
+        }
+        return deferred.promise;
+    }
+
+
+    function getSystemWidgetsBundles() {
+        var deferred = $q.defer();
+        loadWidgetsBundleCache().then(
+            function success() {
+                deferred.resolve(systemWidgetsBundles);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getTenantWidgetsBundles() {
+        var deferred = $q.defer();
+        loadWidgetsBundleCache().then(
+            function success() {
+                deferred.resolve(tenantWidgetsBundles);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getAllWidgetsBundles() {
+        var deferred = $q.defer();
+        loadWidgetsBundleCache().then(
+            function success() {
+                deferred.resolve(allWidgetsBundles);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getSystemWidgetsBundlesByPageLink(pageLink) {
+        var deferred = $q.defer();
+        loadWidgetsBundleCache().then(
+            function success() {
+                utils.filterSearchTextEntities(systemWidgetsBundles, 'title', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getTenantWidgetsBundlesByPageLink(pageLink) {
+        var deferred = $q.defer();
+        loadWidgetsBundleCache().then(
+            function success() {
+                utils.filterSearchTextEntities(tenantWidgetsBundles, 'title', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getAllWidgetsBundlesByPageLink(pageLink) {
+        var deferred = $q.defer();
+        loadWidgetsBundleCache().then(
+            function success() {
+                utils.filterSearchTextEntities(allWidgetsBundles, 'title', pageLink, deferred);
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function getWidgetsBundleByAlias(bundleAlias) {
+        var deferred = $q.defer();
+        loadWidgetsBundleCache().then(
+            function success() {
+                var widgetsBundles = $filter('filter')(allWidgetsBundles, {alias: bundleAlias});
+                if (widgetsBundles.length > 0) {
+                    deferred.resolve(widgetsBundles[0]);
+                } else {
+                    deferred.resolve();
+                }
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function saveWidgetsBundle(widgetsBundle) {
+        var deferred = $q.defer();
+        var url = '/api/widgetsBundle';
+        $http.post(url, widgetsBundle).then(function success(response) {
+            invalidateWidgetsBundleCache();
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    function getWidgetsBundle(widgetsBundleId) {
+        var deferred = $q.defer();
+
+        var url = '/api/widgetsBundle/' + widgetsBundleId;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+
+        return deferred.promise;
+    }
+
+    function deleteWidgetsBundle(widgetsBundleId) {
+        var deferred = $q.defer();
+
+        getWidgetsBundle(widgetsBundleId).then(
+            function success(response) {
+                var widgetsBundle = response;
+                var url = '/api/widgetsBundle/' + widgetsBundleId;
+                $http.delete(url).then(function success() {
+                    invalidateWidgetsBundleCache();
+                    deleteWidgetsBundleFromCache(widgetsBundle.alias,
+                        widgetsBundle.tenantId.id === types.id.nullUid);
+                    deferred.resolve();
+                }, function fail(response) {
+                    deferred.reject(response.data);
+                });
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+
+        return deferred.promise;
+    }
+
+    function getBundleWidgetTypes(bundleAlias, isSystem) {
+        var deferred = $q.defer();
+        var url = '/api/widgetTypes?isSystem=' + (isSystem ? 'true' : 'false') +
+                    '&bundleAlias='+bundleAlias;
+        $http.get(url, null).then(function success(response) {
+            deferred.resolve(response.data);
+        }, function fail(response) {
+            deferred.reject(response.data);
+        });
+        return deferred.promise;
+    }
+
+    /** Widget type functions **/
+
+    function getInstantWidgetInfo(widget) {
+        var widgetInfo = getWidgetInfoFromCache(widget.bundleAlias, widget.typeAlias, widget.isSystemType);
+        if (widgetInfo) {
+            return widgetInfo;
+        } else {
+            return {};
+        }
+    }
+
+    function getWidgetInfo(bundleAlias, widgetTypeAlias, isSystem) {
+        var deferred = $q.defer();
+        var widgetInfo = getWidgetInfoFromCache(bundleAlias, widgetTypeAlias, isSystem);
+        if (widgetInfo) {
+            deferred.resolve(widgetInfo);
+        } else {
+            if ($rootScope.widgetEditMode) {
+                loadWidget(editingWidgetType, bundleAlias, isSystem, deferred);
+            } else {
+                getWidgetType(bundleAlias, widgetTypeAlias, isSystem).then(
+                    function success(widgetType) {
+                        loadWidget(widgetType, bundleAlias, isSystem, deferred);
+                    }, function fail() {
+                        deferred.resolve(missingWidgetType);
+                    }
+                );
+            }
+        }
+        return deferred.promise;
+    }
+
+    function loadWidget(widgetType, bundleAlias, isSystem, deferred) {
+        var widgetInfo = toWidgetInfo(widgetType);
+        loadWidgetResources(widgetInfo, bundleAlias, isSystem).then(
+            function success() {
+                putWidgetInfoToCache(widgetInfo, bundleAlias, widgetInfo.alias, isSystem);
+                deferred.resolve(widgetInfo);
+            }, function fail(errorMessages) {
+                widgetInfo = angular.copy(errorWidgetType);
+                for (var e in errorMessages) {
+                    var error = errorMessages[e];
+                    widgetInfo.templateHtml += '<div class="tb-widget-error-msg">' + error + '</div>';
+                }
+                widgetInfo.templateHtml += '</div>';
+                deferred.resolve(widgetInfo);
+            }
+        );
+    }
+
+    function getWidgetType(bundleAlias, widgetTypeAlias, isSystem) {
+        var deferred = $q.defer();
+        var url = '/api/widgetType?isSystem=' + (isSystem ? 'true' : 'false') +
+            '&bundleAlias='+bundleAlias+'&alias='+widgetTypeAlias;
+        $http.get(url, null).then(function success(response) {
+            var widgetType = response.data;
+            deferred.resolve(widgetType);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function getWidgetTypeById(widgetTypeId) {
+        var deferred = $q.defer();
+        var url = '/api/widgetType/' + widgetTypeId;
+        $http.get(url, null).then(function success(response) {
+            var widgetType = response.data;
+            deferred.resolve(widgetType);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function deleteWidgetType(bundleAlias, widgetTypeAlias, isSystem) {
+        var deferred = $q.defer();
+        getWidgetType(bundleAlias, widgetTypeAlias, isSystem).then(
+            function success(widgetType) {
+                var url = '/api/widgetType/' + widgetType.id.id;
+                $http.delete(url).then(function success() {
+                    deleteWidgetInfoFromCache(bundleAlias, widgetTypeAlias, isSystem);
+                    deferred.resolve();
+                }, function fail() {
+                    deferred.reject();
+                });
+            },
+            function fail() {
+                deferred.reject();
+            }
+        );
+        return deferred.promise;
+    }
+
+    function saveWidgetType(widgetInfo, id, bundleAlias) {
+        var deferred = $q.defer();
+        var widgetType = toWidgetType(widgetInfo, id, undefined, bundleAlias);
+        var url = '/api/widgetType';
+        $http.post(url, widgetType).then(function success(response) {
+            var widgetType = response.data;
+            deleteWidgetInfoFromCache(widgetType.bundleAlias, widgetType.alias, widgetType.tenantId.id === types.id.nullUid);
+            deferred.resolve(widgetType);
+        }, function fail() {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+    function loadWidgetResources(widgetInfo, bundleAlias, isSystem) {
+
+        var deferred = $q.defer();
+        var errors = [];
+
+        var widgetNamespace = "widget-type-" + (isSystem ? 'sys-' : '') + bundleAlias + '-' + widgetInfo.alias;
+        cssParser.cssPreviewNamespace = widgetNamespace;
+        cssParser.createStyleElement(widgetNamespace, widgetInfo.templateCss);
+
+        function loadNextOrComplete(i) {
+            i++;
+            if (i < widgetInfo.resources.length) {
+                loadNext(i);
+            } else {
+                if (errors.length > 0) {
+                    deferred.reject(errors);
+                } else {
+                    deferred.resolve();
+                }
+            }
+        }
+
+        function loadNext(i) {
+            var resourceUrl = widgetInfo.resources[i].url;
+            if (resourceUrl && resourceUrl.length > 0) {
+                $ocLazyLoad.load(resourceUrl).then(
+                    function success() {
+                        loadNextOrComplete(i);
+                    },
+                    function fail() {
+                        errors.push('Failed to load widget resource: \'' + resourceUrl + '\'');
+                        loadNextOrComplete(i);
+                    }
+                );
+            } else {
+                loadNextOrComplete(i);
+            }
+        }
+
+        if (widgetInfo.resources.length > 0) {
+            loadNext(0);
+        } else {
+            deferred.resolve();
+        }
+
+        return deferred.promise;
+    }
+
+}

diff --git a/ui/src/app/app.config.js b/ui/src/app/app.config.js
new file mode 100644
index 0000000..12d60f6
--- /dev/null
+++ b/ui/src/app/app.config.js
@@ -0,0 +1,147 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import injectTapEventPlugin from 'react-tap-event-plugin';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import mdiIconSet from '../svg/mdi.svg';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+const PRIMARY_BACKGROUND_COLOR = "#305680";//#2856b6";//"#3f51b5";
+const SECONDARY_BACKGROUND_COLOR = "#527dad";
+const HUE3_COLOR = "#a7c1de";
+
+/*@ngInject*/
+export default function AppConfig($provide,
+                                  $urlRouterProvider,
+                                  $locationProvider,
+                                  $mdIconProvider,
+                                  $mdThemingProvider,
+                                  $httpProvider,
+                                  $translateProvider,
+                                  storeProvider) {
+
+    injectTapEventPlugin();
+    $locationProvider.html5Mode(true);
+    $urlRouterProvider.otherwise('/home');
+    storeProvider.setCaching(false);
+
+    $translateProvider.useStaticFilesLoader({
+        prefix: 'static/locale/',// path to translations files
+        suffix: '.json'// suffix, currently- extension of the translations
+    });
+
+    $translateProvider.useSanitizeValueStrategy('sanitize');
+    $translateProvider.preferredLanguage('en_US');
+    $translateProvider.useLocalStorage();
+    $translateProvider.useMissingTranslationHandlerLog();
+    $translateProvider.addInterpolation('$translateMessageFormatInterpolation');
+
+    $httpProvider.interceptors.push('globalInterceptor');
+
+    $provide.decorator("$exceptionHandler", ['$delegate', '$injector', function ($delegate, $injector) {
+        return function (exception, cause) {
+            var rootScope = $injector.get("$rootScope");
+            var $window = $injector.get("$window");
+            var utils = $injector.get("utils");
+            if (rootScope.widgetEditMode) {
+                var parentScope = $window.parent.angular.element($window.frameElement).scope();
+                var data = utils.parseException(exception);
+                parentScope.$emit('widgetException', data);
+                parentScope.$apply();
+            }
+            $delegate(exception, cause);
+        };
+    }]);
+
+    $mdIconProvider.iconSet('mdi', mdiIconSet);
+
+    configureTheme();
+
+    function blueGrayTheme() {
+        var tbPrimaryPalette = $mdThemingProvider.extendPalette('blue-grey');
+        var tbAccentPalette = $mdThemingProvider.extendPalette('orange', {
+            'contrastDefaultColor': 'light'
+        });
+
+        $mdThemingProvider.definePalette('tb-primary', tbPrimaryPalette);
+        $mdThemingProvider.definePalette('tb-accent', tbAccentPalette);
+
+        $mdThemingProvider.theme('default')
+            .primaryPalette('tb-primary')
+            .accentPalette('tb-accent');
+
+        $mdThemingProvider.theme('tb-dark')
+            .primaryPalette('tb-primary')
+            .accentPalette('tb-accent')
+            .backgroundPalette('tb-primary')
+            .dark();
+    }
+
+    function indigoTheme() {
+        var tbPrimaryPalette = $mdThemingProvider.extendPalette('indigo', {
+            '500': PRIMARY_BACKGROUND_COLOR,
+            '600': SECONDARY_BACKGROUND_COLOR,
+            'A100': HUE3_COLOR
+        });
+
+        var tbAccentPalette = $mdThemingProvider.extendPalette('deep-orange');
+
+        $mdThemingProvider.definePalette('tb-primary', tbPrimaryPalette);
+        $mdThemingProvider.definePalette('tb-accent', tbAccentPalette);
+
+        var tbDarkPrimaryPalette = $mdThemingProvider.extendPalette('tb-primary', {
+            '500': '#9fa8da'
+        });
+
+        var tbDarkPrimaryBackgroundPalette = $mdThemingProvider.extendPalette('tb-primary', {
+            '800': PRIMARY_BACKGROUND_COLOR
+        });
+
+        $mdThemingProvider.definePalette('tb-dark-primary', tbDarkPrimaryPalette);
+        $mdThemingProvider.definePalette('tb-dark-primary-background', tbDarkPrimaryBackgroundPalette);
+
+        $mdThemingProvider.theme('default')
+            .primaryPalette('tb-primary')
+            .accentPalette('tb-accent');
+
+        $mdThemingProvider.theme('tb-dark')
+            .primaryPalette('tb-dark-primary')
+            .accentPalette('tb-accent')
+            .backgroundPalette('tb-dark-primary-background')
+            .dark();
+    }
+
+    function configureTheme() {
+
+        var theme = 'indigo';
+
+        if (theme === 'blueGray') {
+            blueGrayTheme();
+        } else {
+            indigoTheme();
+        }
+
+        $mdThemingProvider.theme('tb-search-input', 'default')
+            .primaryPalette('tb-primary')
+            .backgroundPalette('tb-primary');
+
+        $mdThemingProvider.setDefaultTheme('default');
+        $mdThemingProvider.alwaysWatchTheme(true);
+    }
+
+}
\ No newline at end of file

diff --git a/ui/src/app/app.js b/ui/src/app/app.js
new file mode 100644
index 0000000..3d55ac1
--- /dev/null
+++ b/ui/src/app/app.js
@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import angular from 'angular';
+import ngMaterial from 'angular-material';
+import ngMdIcons from 'angular-material-icons';
+import ngCookies from 'angular-cookies';
+import 'angular-translate';
+import 'angular-translate-loader-static-files';
+import 'angular-translate-storage-local';
+import 'angular-translate-storage-cookie';
+import 'angular-translate-handler-log';
+import 'angular-translate-interpolation-messageformat';
+import 'md-color-picker';
+import mdPickers from 'mdPickers';
+import ngSanitize from 'angular-sanitize';
+import vAccordion from 'v-accordion';
+import ngAnimate from 'angular-animate';
+import 'angular-websocket';
+import uiRouter from 'angular-ui-router';
+import angularJwt from 'angular-jwt';
+import 'angular-drag-and-drop-lists';
+import mdDataTable from 'angular-material-data-table';
+import ngTouch from 'angular-touch';
+import 'angular-carousel';
+import 'clipboard';
+import 'ngclipboard';
+import 'react';
+import 'react-dom';
+import 'material-ui';
+import 'react-schema-form';
+import react from 'ngreact';
+
+import thingsboardLogin from './login';
+import thingsboardDialogs from './components/datakey-config-dialog.controller';
+import thingsboardMenu from './services/menu.service';
+import thingsboardUtils from './common/utils.service';
+import thingsboardTypes from './common/types.constant';
+import thingsboardHelp from './help/help.directive';
+import thingsboardToast from './services/toast';
+import thingsboardHome from './layout';
+import thingsboardApiLogin from './api/login.service';
+import thingsboardApiDevice from './api/device.service';
+import thingsboardApiUser from './api/user.service';
+
+import 'font-awesome/css/font-awesome.min.css';
+import 'angular-material/angular-material.min.css';
+import 'angular-material-icons/angular-material-icons.css';
+import 'angular-gridster/dist/angular-gridster.min.css';
+import 'v-accordion/dist/v-accordion.min.css'
+import 'md-color-picker/dist/mdColorPicker.min.css';
+import 'mdPickers/dist/mdPickers.min.css';
+import 'angular-hotkeys/build/hotkeys.min.css';
+import 'angular-carousel/dist/angular-carousel.min.css';
+import '../scss/main.scss';
+
+import AppConfig from './app.config';
+import GlobalInterceptor from './global-interceptor.service';
+import AppRun from './app.run';
+
+angular.module('thingsboard', [
+    ngMaterial,
+    ngMdIcons,
+    ngCookies,
+    'pascalprecht.translate',
+    'mdColorPicker',
+    mdPickers,
+    ngSanitize,
+    vAccordion,
+    ngAnimate,
+    'ngWebSocket',
+    angularJwt,
+    'dndLists',
+    mdDataTable,
+    ngTouch,
+    'angular-carousel',
+    'ngclipboard',
+    react.name,
+    thingsboardLogin,
+    thingsboardDialogs,
+    thingsboardMenu,
+    thingsboardUtils,
+    thingsboardTypes,
+    thingsboardHelp,
+    thingsboardToast,
+    thingsboardHome,
+    thingsboardApiLogin,
+    thingsboardApiDevice,
+    thingsboardApiUser,
+    uiRouter])
+    .config(AppConfig)
+    .factory('globalInterceptor', GlobalInterceptor)
+    .run(AppRun);

diff --git a/ui/src/app/app.run.js b/ui/src/app/app.run.js
new file mode 100644
index 0000000..934f021
--- /dev/null
+++ b/ui/src/app/app.run.js
@@ -0,0 +1,166 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*@ngInject*/
+export default function AppRun($rootScope, $window, $log, $state, $mdDialog, $filter, loginService, userService, $translate) {
+
+    var frame = $window.frameElement;
+    var unauthorizedDialog = null;
+    var forbiddenDialog = null;
+
+    if (frame) {
+        var dataWidgetAttr = angular.element(frame).attr('data-widget');
+        if (dataWidgetAttr) {
+            $rootScope.editWidgetInfo = angular.fromJson(dataWidgetAttr);
+            $rootScope.widgetEditMode = true;
+        }
+    }
+
+    initWatchers();
+
+    function initWatchers() {
+        $rootScope.unauthenticatedHandle = $rootScope.$on('unauthenticated', function (event, doLogout) {
+            if (doLogout) {
+                $state.go('login');
+            } else {
+                checkCurrentState();
+            }
+        });
+
+        $rootScope.authenticatedHandle = $rootScope.$on('authenticated', function () {
+            checkCurrentState();
+        });
+
+        $rootScope.forbiddenHandle = $rootScope.$on('forbidden', function () {
+            showForbiddenDialog();
+        });
+
+        $rootScope.stateChangeStartHandle = $rootScope.$on('$stateChangeStart', function (evt, to, params) {
+            if (userService.isUserLoaded() === true) {
+                if (userService.isAuthenticated()) {
+                    var authority = userService.getAuthority();
+                    if (to.module === 'public') {
+                        evt.preventDefault();
+                        $state.go('home', params);
+                    } else if (angular.isDefined(to.auth) &&
+                        to.auth.indexOf(authority) === -1) {
+                        evt.preventDefault();
+                        showForbiddenDialog();
+                    } else if (to.redirectTo) {
+                        evt.preventDefault();
+                        $state.go(to.redirectTo, params)
+                    }
+                } else {
+                    if (to.module === 'private') {
+                        evt.preventDefault();
+                        if (to.url === '/home') {
+                            $state.go('login', params);
+                        } else {
+                            showUnauthorizedDialog();
+                        }
+                    }
+                }
+            } else {
+                evt.preventDefault();
+                $rootScope.userLoadedHandle = $rootScope.$on('userLoaded', function () {
+                    $rootScope.userLoadedHandle();
+                    $state.go(to.name, params);
+                });
+            }
+        })
+
+        $rootScope.pageTitle = 'Thingsboard';
+
+        $rootScope.stateChangeSuccessHandle = $rootScope.$on('$stateChangeSuccess', function (evt, to) {
+            if (angular.isDefined(to.data.pageTitle)) {
+                $translate(to.data.pageTitle).then(function (translation) {
+                    $rootScope.pageTitle = 'Thingsboard | ' + translation;
+                }, function (translationId) {
+                    $rootScope.pageTitle = 'Thingsboard | ' + translationId;
+                });
+            }
+        })
+    }
+
+    function checkCurrentState() {
+        if (userService.isUserLoaded() === true) {
+            var module = $state.$current.module;
+            if (userService.isAuthenticated()) {
+                if ($state.$current.module === 'public') {
+                    $state.go('home');
+                }
+            } else {
+                if (angular.isUndefined(module) || !module) {
+                    //$state.go('login');
+                } else if ($state.$current.module === 'private') {
+                    showUnauthorizedDialog();
+                }
+            }
+        } else {
+            showUnauthorizedDialog();
+        }
+    }
+
+    function showUnauthorizedDialog() {
+        if (unauthorizedDialog === null) {
+            $translate(['access.unauthorized-access',
+                        'access.unauthorized-access-text',
+                        'access.unauthorized',
+                        'action.cancel',
+                        'action.sign-in']).then(function (translations) {
+                if (unauthorizedDialog === null) {
+                    unauthorizedDialog = $mdDialog.confirm()
+                        .title(translations['access.unauthorized-access'])
+                        .textContent(translations['access.unauthorized-access-text'])
+                        .ariaLabel(translations['access.unauthorized'])
+                        .cancel(translations['action.cancel'])
+                        .ok(translations['action.sign-in']);
+                    $mdDialog.show(unauthorizedDialog).then(function () {
+                        unauthorizedDialog = null;
+                        $state.go('login');
+                    }, function () {
+                        unauthorizedDialog = null;
+                    });
+                }
+            });
+        }
+    }
+
+    function showForbiddenDialog() {
+        if (forbiddenDialog === null) {
+            $translate(['access.access-forbidden',
+                'access.access-forbidden-text',
+                'access.access-forbidden',
+                'action.cancel',
+                'action.sign-in']).then(function (translations) {
+                if (forbiddenDialog === null) {
+                    forbiddenDialog = $mdDialog.confirm()
+                        .title(translations['access.access-forbidden'])
+                        .htmlContent(translations['access.access-forbidden-text'])
+                        .ariaLabel(translations['access.access-forbidden'])
+                        .cancel(translations['action.cancel'])
+                        .ok(translations['action.sign-in']);
+                    $mdDialog.show(forbiddenDialog).then(function () {
+                        forbiddenDialog = null;
+                        userService.logout();
+                    }, function () {
+                        forbiddenDialog = null;
+                    });
+                }
+            });
+        }
+    }
+}

diff --git a/ui/src/app/common/types.constant.js b/ui/src/app/common/types.constant.js
new file mode 100644
index 0000000..54ca208
--- /dev/null
+++ b/ui/src/app/common/types.constant.js
@@ -0,0 +1,151 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.types', [])
+    .constant('types',
+        {
+            serverErrorCode: {
+                general: 2,
+                authentication: 10,
+                jwtTokenExpired: 11,
+                permissionDenied: 20,
+                invalidArguments: 30,
+                badRequestParams: 31,
+                itemNotFound: 32
+            },
+            entryPoints: {
+                login: "/api/auth/login",
+                tokenRefresh: "/api/auth/token",
+                nonTokenBased: "/api/noauth"
+            },
+            id: {
+                nullUid: "13814000-1dd2-11b2-8080-808080808080",
+            },
+            datasourceType: {
+                function: "function",
+                device: "device"
+            },
+            dataKeyType: {
+                timeseries: "timeseries",
+                attribute: "attribute",
+                function: "function"
+            },
+            componentType: {
+                filter: "FILTER",
+                processor: "PROCESSOR",
+                action: "ACTION",
+                plugin: "PLUGIN"
+            },
+            entityType: {
+                tenant: "TENANT",
+                device: "DEVICE",
+                customer: "CUSTOMER",
+                rule: "RULE",
+                plugin: "PLUGIN"
+            },
+            eventType: {
+                alarm: {
+                    value: "ALARM",
+                    name: "event.type-alarm"
+                },
+                error: {
+                    value: "ERROR",
+                    name: "event.type-error"
+                },
+                lcEvent: {
+                    value: "LC_EVENT",
+                    name: "event.type-lc-event"
+                },
+                stats: {
+                    value: "STATS",
+                    name: "event.type-stats"
+                }
+            },
+            latestTelemetry: {
+                value: "LATEST_TELEMETRY",
+                name: "attribute.scope-latest-telemetry",
+                clientSide: true
+            },
+            deviceAttributesScope: {
+                client: {
+                    value: "CLIENT_SCOPE",
+                    name: "attribute.scope-client",
+                    clientSide: true
+                },
+                server: {
+                    value: "SERVER_SCOPE",
+                    name: "attribute.scope-server",
+                    clientSide: false
+                },
+                shared: {
+                    value: "SHARED_SCOPE",
+                    name: "attribute.scope-shared",
+                    clientSide: false
+                }
+            },
+            valueType: {
+                string: {
+                    value: "string",
+                    name: "value.string",
+                    icon: "mdi:format-text"
+                },
+                integer: {
+                    value: "integer",
+                    name: "value.integer",
+                    icon: "mdi:numeric"
+                },
+                double: {
+                    value: "double",
+                    name: "value.double",
+                    icon: "mdi:numeric"
+                },
+                boolean: {
+                    value: "boolean",
+                    name: "value.boolean",
+                    icon: "mdi:checkbox-marked-outline"
+                }
+            },
+            widgetType: {
+                timeseries: {
+                    value: "timeseries",
+                    name: "widget.timeseries",
+                    template: {
+                        bundleAlias: "charts",
+                        alias: "basic_timeseries"
+                    }
+                },
+                latest: {
+                    value: "latest",
+                    name: "widget.latest-values",
+                    template: {
+                        bundleAlias: "cards",
+                        alias: "attributes_card"
+                    }
+                },
+                rpc: {
+                    value: "rpc",
+                    name: "widget.rpc",
+                    template: {
+                        bundleAlias: "gpio_widgets",
+                        alias: "basic_gpio_control"
+                    }
+                }
+            },
+            systemBundleAlias: {
+                charts: "charts",
+                cards: "cards"
+            }
+        }
+    ).name;

diff --git a/ui/src/app/common/utils.service.js b/ui/src/app/common/utils.service.js
new file mode 100644
index 0000000..d6dd0c0
--- /dev/null
+++ b/ui/src/app/common/utils.service.js
@@ -0,0 +1,265 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import tinycolor from "tinycolor2";
+import jsonSchemaDefaults from "json-schema-defaults";
+import thingsboardTypes from "./types.constant";
+
+export default angular.module('thingsboard.utils', [thingsboardTypes])
+    .factory('utils', Utils)
+    .name;
+
+/*@ngInject*/
+function Utils($mdColorPalette, types) {
+
+    var predefinedFunctions = {},
+        predefinedFunctionsList = [],
+        materialColors = [];
+
+    predefinedFunctions['Sin'] = "return Math.round(1000*Math.sin(time/5000));";
+    predefinedFunctions['Cos'] = "return Math.round(1000*Math.cos(time/5000));";
+    predefinedFunctions['Random'] =
+        "var value = prevValue + Math.random() * 100 - 50;\n" +
+        "var multiplier = Math.pow(10, 2 || 0);\n" +
+        "var value = Math.round(value * multiplier) / multiplier;\n" +
+        "if (value < -1000) {\n" +
+        "	value = -1000;\n" +
+        "} else if (value > 1000) {\n" +
+        "	value = 1000;\n" +
+        "}\n" +
+        "return value;";
+
+    for (var func in predefinedFunctions) {
+        predefinedFunctionsList.push(func);
+    }
+
+    var colorPalettes = ['blue', 'green', 'red', 'amber', 'blue-grey', 'purple', 'light-green', 'indigo', 'pink', 'yellow', 'light-blue', 'orange', 'deep-purple', 'lime', 'teal', 'brown', 'cyan', 'deep-orange', 'grey'];
+    var colorSpectrum = ['500', 'A700', '600', '700', '800', '900', '300', '400', 'A200', 'A400'];
+
+    angular.forEach($mdColorPalette, function (value, key) {
+        angular.forEach(value, function (color, label) {
+            if (colorSpectrum.indexOf(label) > -1) {
+                var rgb = 'rgb(' + color.value[0] + ',' + color.value[1] + ',' + color.value[2] + ')';
+                color = tinycolor(rgb);
+                var isDark = color.isDark();
+                var colorItem = {
+                    value: color.toHexString(),
+                    group: key,
+                    label: label,
+                    isDark: isDark
+                };
+                materialColors.push(colorItem);
+            }
+        });
+    });
+
+    materialColors.sort(function (colorItem1, colorItem2) {
+        var spectrumIndex1 = colorSpectrum.indexOf(colorItem1.label);
+        var spectrumIndex2 = colorSpectrum.indexOf(colorItem2.label);
+        var result = spectrumIndex1 - spectrumIndex2;
+        if (result === 0) {
+            var paletteIndex1 = colorPalettes.indexOf(colorItem1.group);
+            var paletteIndex2 = colorPalettes.indexOf(colorItem2.group);
+            result = paletteIndex1 - paletteIndex2;
+        }
+        return result;
+    });
+
+    var defaultDataKey = {
+        name: 'f(x)',
+        type: types.dataKeyType.function,
+        label: 'Sin',
+        color: getMaterialColor(0),
+        funcBody: getPredefinedFunctionBody('Sin'),
+        settings: {},
+        _hash: Math.random()
+    };
+
+    var defaultDatasource = {
+        type: types.datasourceType.function,
+        name: types.datasourceType.function,
+        dataKeys: [angular.copy(defaultDataKey)]
+    };
+
+    var service = {
+        getDefaultDatasource: getDefaultDatasource,
+        getDefaultDatasourceJson: getDefaultDatasourceJson,
+        getMaterialColor: getMaterialColor,
+        getPredefinedFunctionBody: getPredefinedFunctionBody,
+        getPredefinedFunctionsList: getPredefinedFunctionsList,
+        genMaterialColor: genMaterialColor,
+        objectHashCode: objectHashCode,
+        parseException: parseException,
+        isDescriptorSchemaNotEmpty: isDescriptorSchemaNotEmpty,
+        filterSearchTextEntities: filterSearchTextEntities
+    }
+
+    return service;
+
+    function getPredefinedFunctionsList() {
+        return predefinedFunctionsList;
+    }
+
+    function getPredefinedFunctionBody(func) {
+        return predefinedFunctions[func];
+    }
+
+    function getMaterialColor(index) {
+        var colorIndex = index % materialColors.length;
+        return materialColors[colorIndex].value;
+    }
+
+    function genMaterialColor(str) {
+        var hash = Math.abs(hashCode(str));
+        return getMaterialColor(hash);
+    }
+
+    function hashCode(str) {
+        var hash = 0;
+        var i, char;
+        if (str.length == 0) return hash;
+        for (i = 0; i < str.length; i++) {
+            char = str.charCodeAt(i);
+            hash = ((hash << 5) - hash) + char;
+            hash = hash & hash; // Convert to 32bit integer
+        }
+        return hash;
+    }
+
+    function objectHashCode(obj) {
+        var hash = 0;
+        if (obj) {
+            var str = angular.toJson(obj);
+            hash = hashCode(str);
+        }
+        return hash;
+    }
+
+    function parseException(exception) {
+        var data = {};
+        if (exception) {
+            if (angular.isString(exception) || exception instanceof String) {
+                data.message = exception;
+            } else {
+                if (exception.name) {
+                    data.name = exception.name;
+                } else {
+                    data.name = 'UnknownError';
+                }
+                if (exception.message) {
+                    data.message = exception.message;
+                }
+                if (exception.lineNumber) {
+                    data.lineNumber = exception.lineNumber;
+                    if (exception.columnNumber) {
+                        data.columnNumber = exception.columnNumber;
+                    }
+                } else if (exception.stack) {
+                    var lineInfoRegexp = /(.*<anonymous>):(\d*)(:)?(\d*)?/g;
+                    var lineInfoGroups = lineInfoRegexp.exec(exception.stack);
+                    if (lineInfoGroups != null && lineInfoGroups.length >= 3) {
+                        data.lineNumber = lineInfoGroups[2] - 2;
+                        if (lineInfoGroups.length >= 5) {
+                            data.columnNumber = lineInfoGroups[4];
+                        }
+                    }
+                }
+            }
+        }
+        return data;
+    }
+
+    function getDefaultDatasource(dataKeySchema) {
+        var datasource = angular.copy(defaultDatasource);
+        if (angular.isDefined(dataKeySchema)) {
+            datasource.dataKeys[0].settings = jsonSchemaDefaults(dataKeySchema);
+        }
+        return datasource;
+    }
+
+    function getDefaultDatasourceJson(dataKeySchema) {
+        return angular.toJson(getDefaultDatasource(dataKeySchema));
+    }
+
+    function isDescriptorSchemaNotEmpty(descriptor) {
+        if (descriptor && descriptor.schema && descriptor.schema.properties) {
+            for(var prop in descriptor.schema.properties) {
+                if (descriptor.schema.properties.hasOwnProperty(prop)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    function filterSearchTextEntities(entities, searchTextField, pageLink, deferred) {
+        var response = {
+            data: [],
+            hasNext: false,
+            nextPageLink: null
+        };
+        var limit = pageLink.limit;
+        var textSearch = '';
+        if (pageLink.textSearch) {
+            textSearch = pageLink.textSearch.toLowerCase();
+        }
+
+        for (var i=0;i<entities.length;i++) {
+            var entity = entities[i];
+            var text = entity[searchTextField].toLowerCase();
+            var createdTime = entity.createdTime;
+            if (pageLink.textOffset && pageLink.textOffset.length > 0) {
+                var comparison = text.localeCompare(pageLink.textOffset);
+                if (comparison === 0
+                    && createdTime < pageLink.createdTimeOffset) {
+                    response.data.push(entity);
+                    if (response.data.length === limit) {
+                        break;
+                    }
+                } else if (comparison > 0 && text.startsWith(textSearch)) {
+                    response.data.push(entity);
+                    if (response.data.length === limit) {
+                        break;
+                    }
+                }
+            } else if (textSearch.length > 0) {
+                if (text.startsWith(textSearch)) {
+                    response.data.push(entity);
+                    if (response.data.length === limit) {
+                        break;
+                    }
+                }
+            } else {
+                response.data.push(entity);
+                if (response.data.length === limit) {
+                    break;
+                }
+            }
+        }
+        if (response.data.length === limit) {
+            var lastEntity = response.data[limit-1];
+            response.nextPageLink = {
+                limit: pageLink.limit,
+                textSearch: textSearch,
+                idOffset: lastEntity.id.id,
+                createdTimeOffset: lastEntity.createdTime,
+                textOffset: lastEntity[searchTextField].toLowerCase()
+            };
+            response.hasNext = true;
+        }
+        deferred.resolve(response);
+    }
+
+}

diff --git a/ui/src/app/component/component.directive.js b/ui/src/app/component/component.directive.js
new file mode 100644
index 0000000..2fe6c83
--- /dev/null
+++ b/ui/src/app/component/component.directive.js
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import componentTemplate from './component.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function ComponentDirective($compile, $templateCache, $document, $mdDialog, componentDialogService, componentDescriptorService) {
+
+    var linker = function (scope, element) {
+
+        var template = $templateCache.get(componentTemplate);
+
+        element.html(template);
+
+        scope.componentTypeName = '';
+
+        scope.loadComponentTypeName = function () {
+            componentDescriptorService.getComponentDescriptorByClazz(scope.component.clazz).then(
+                function success(component) {
+                    scope.componentTypeName = component.name;
+                },
+                function fail() {}
+            );
+        }
+
+        scope.$watch('component', function(newVal) {
+                if (newVal) {
+                    scope.loadComponentTypeName();
+                }
+            }
+        );
+
+        scope.openComponent = function($event) {
+            componentDialogService.openComponentDialog($event, false,
+                scope.readOnly, scope.title, scope.type, scope.pluginClazz,
+                angular.copy(scope.component)).then(
+                    function success(component) {
+                        scope.component = component;
+                    },
+                    function fail() {}
+            );
+        }
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        link: linker,
+        scope: {
+            component: '=',
+            type: '=',
+            pluginClazz: '=',
+            title: '@',
+            readOnly: '=',
+            onRemoveComponent: '&'
+        }
+    };
+}

diff --git a/ui/src/app/component/component.tpl.html b/ui/src/app/component/component.tpl.html
new file mode 100644
index 0000000..cc55059
--- /dev/null
+++ b/ui/src/app/component/component.tpl.html
@@ -0,0 +1,58 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div class="md-whiteframe-4dp" flex layout="row" layout-align="start center"
+     style="padding: 0 0 0 10px; margin: 5px;">
+    <span flex="50">
+        {{ component.name }}
+    </span>
+    <span flex="50">
+        {{ componentTypeName }}
+    </span>
+    <span ng-if="readOnly" style="min-width: 40px; min-height: 40px; margin: 0 6px;"></br></span>
+    <md-button ng-disabled="loading" class="md-icon-button md-primary"
+               style="min-width: 40px;"
+               ng-click="openComponent($event)"
+               aria-label="{{ (readOnly ? 'action.view' : 'action.edit') | translate }}">
+        <md-tooltip ng-if="readOnly" md-direction="top">
+            {{ 'action.view' | translate }}
+        </md-tooltip>
+        <md-tooltip ng-if="!readOnly" md-direction="top">
+            {{ 'action.edit' | translate }}
+        </md-tooltip>
+        <md-icon ng-if="readOnly" aria-label="{{ 'action.view' | translate }}"
+                 class="material-icons">
+            more_horiz
+        </md-icon>
+        <md-icon ng-if="!readOnly" aria-label="{{ 'action.edit' | translate }}"
+                 class="material-icons">
+            edit
+        </md-icon>
+    </md-button>
+    <md-button ng-if="!readOnly" ng-disabled="loading" class="md-icon-button md-primary"
+               style="min-width: 40px;"
+               ng-click="onRemoveComponent({event: $event})"
+               aria-label="{{ 'action.remove' | translate }}">
+        <md-tooltip md-direction="top">
+            {{ 'action.remove' | translate }}
+        </md-tooltip>
+        <md-icon aria-label="{{ 'action.delete' | translate }}"
+                 class="material-icons">
+            close
+        </md-icon>
+    </md-button>
+</div>
\ No newline at end of file

diff --git a/ui/src/app/component/component-dialog.controller.js b/ui/src/app/component/component-dialog.controller.js
new file mode 100644
index 0000000..fb1d1da
--- /dev/null
+++ b/ui/src/app/component/component-dialog.controller.js
@@ -0,0 +1,105 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*@ngInject*/
+export default function ComponentDialogController($mdDialog, $q, $scope, componentDescriptorService, types, utils, helpLinks, isAdd, isReadOnly, componentInfo) {
+
+    var vm = this;
+
+    vm.isReadOnly = isReadOnly;
+    vm.isAdd = isAdd;
+    vm.componentInfo = componentInfo;
+    if (isAdd) {
+        vm.componentInfo.component = {};
+    }
+
+    vm.componentHasSchema = false;
+    vm.componentDescriptors = [];
+
+    if (vm.componentInfo.component && !vm.componentInfo.component.configuration) {
+        vm.componentInfo.component.configuration = {};
+    }
+
+    vm.helpLinkIdForComponent = helpLinkIdForComponent;
+    vm.save = save;
+    vm.cancel = cancel;
+
+    $scope.$watch("vm.componentInfo.component.clazz", function (newValue, prevValue) {
+        if (newValue != prevValue) {
+            if (newValue && prevValue) {
+                vm.componentInfo.component.configuration = {};
+            }
+            loadComponentDescriptor();
+        }
+    });
+
+    var componentDescriptorsPromise =
+        vm.componentInfo.type === types.componentType.action
+            ? componentDescriptorService.getPluginActionsByPluginClazz(vm.componentInfo.pluginClazz)
+            : componentDescriptorService.getComponentDescriptorsByType(vm.componentInfo.type);
+
+    componentDescriptorsPromise.then(
+        function success(componentDescriptors) {
+            vm.componentDescriptors = componentDescriptors;
+            if (vm.componentDescriptors.length === 1 && isAdd && !vm.componentInfo.component.clazz) {
+                vm.componentInfo.component.clazz = vm.componentDescriptors[0].clazz;
+            }
+        },
+        function fail() {
+        }
+    );
+
+    loadComponentDescriptor();
+
+    function loadComponentDescriptor () {
+        if (vm.componentInfo.component.clazz) {
+            componentDescriptorService.getComponentDescriptorByClazz(vm.componentInfo.component.clazz).then(
+                function success(componentDescriptor) {
+                    vm.componentDescriptor = componentDescriptor;
+                    vm.componentHasSchema = utils.isDescriptorSchemaNotEmpty(vm.componentDescriptor.configurationDescriptor);
+                },
+                function fail() {
+                }
+            );
+        } else {
+            vm.componentHasSchema = false;
+        }
+    }
+
+    function helpLinkIdForComponent() {
+        switch (vm.componentInfo.type) {
+            case types.componentType.filter: {
+                return helpLinks.getFilterLink(vm.componentInfo.component);
+            }
+            case types.componentType.processor: {
+                return helpLinks.getProcessorLink(vm.componentInfo.component);
+            }
+            case types.componentType.action: {
+                return helpLinks.getPluginActionLink(vm.componentInfo.component);
+            }
+
+        }
+    }
+
+
+    function cancel () {
+        $mdDialog.cancel();
+    }
+
+    function save () {
+        $mdDialog.hide(vm.componentInfo.component);
+    }
+
+}

diff --git a/ui/src/app/component/component-dialog.service.js b/ui/src/app/component/component-dialog.service.js
new file mode 100644
index 0000000..a9ad10f
--- /dev/null
+++ b/ui/src/app/component/component-dialog.service.js
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import componentDialogTemplate from './component-dialog.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function ComponentDialogService($mdDialog, $document, $q) {
+
+    var service = {
+        openComponentDialog: openComponentDialog
+    }
+
+    return service;
+
+    function openComponentDialog($event, isAdd, readOnly, title, type, pluginClazz, component) {
+        var deferred = $q.defer();
+        var componentInfo = {
+            title: title,
+            type: type,
+            pluginClazz: pluginClazz
+        };
+        if (component) {
+            componentInfo.component = angular.copy(component);
+        }
+        $mdDialog.show({
+            controller: 'ComponentDialogController',
+            controllerAs: 'vm',
+            templateUrl: componentDialogTemplate,
+            locals: {isAdd: isAdd,
+                isReadOnly: readOnly,
+                componentInfo: componentInfo},
+            parent: angular.element($document[0].body),
+            fullscreen: true,
+            targetEvent: $event,
+            skipHide: true
+        }).then(function (component) {
+            deferred.resolve(component);
+        }, function () {
+            deferred.reject();
+        });
+        return deferred.promise;
+    }
+
+}
\ No newline at end of file

diff --git a/ui/src/app/component/component-dialog.tpl.html b/ui/src/app/component/component-dialog.tpl.html
new file mode 100644
index 0000000..1720b92
--- /dev/null
+++ b/ui/src/app/component/component-dialog.tpl.html
@@ -0,0 +1,79 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-dialog aria-label="{{ vm.componentInfo.title | translate }}" tb-help="vm.helpLinkIdForComponent()" help-container-id="help-container">
+    <form name="theForm" ng-submit="vm.save()">
+        <md-toolbar>
+            <div class="md-toolbar-tools">
+                <h2 translate>{{ vm.componentInfo.title }}</h2>
+                <span flex></span>
+                <div id="help-container"></div>
+                <md-button class="md-icon-button" ng-click="vm.cancel()">
+                    <ng-md-icon icon="close" aria-label="{{ 'dialog.close' | translate }}"></ng-md-icon>
+                </md-button>
+            </div>
+        </md-toolbar>
+        <md-progress-linear class="md-warn" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+        <span style="min-height: 5px;" flex="" ng-show="!loading"></span>
+        <md-dialog-content>
+            <div class="md-dialog-content tb-filter">
+                <fieldset ng-disabled="loading || vm.isReadOnly">
+                    <section flex layout="row">
+                        <md-input-container flex class="md-block">
+                            <label translate>rule.component-name</label>
+                            <input required name="componentName" ng-model="vm.componentInfo.component.name">
+                            <div ng-messages="theForm.componentName.$error">
+                                <div translate ng-message="required">rule.component-name-required</div>
+                            </div>
+                        </md-input-container>
+                        <md-input-container flex class="md-block">
+                            <label translate>rule.component-type</label>
+                            <md-select required name="componentType" ng-model="vm.componentInfo.component.clazz" ng-disabled="loading || vm.isReadOnly">
+                                <md-option ng-repeat="componentDescriptor in vm.componentDescriptors" ng-value="componentDescriptor.clazz">
+                                    {{componentDescriptor.name}}
+                                </md-option>
+                            </md-select>
+                            <div ng-messages="theForm.componentType.$error">
+                                <div translate ng-message="required">rule.component-type-required</div>
+                            </div>
+                        </md-input-container>
+                    </section>
+                    <md-card flex class="plugin-config" ng-if="vm.componentHasSchema">
+                        <md-card-content>
+                            <tb-json-form schema="vm.componentDescriptor.configurationDescriptor.schema"
+                                          form="vm.componentDescriptor.configurationDescriptor.form"
+                                          model="vm.componentInfo.component.configuration"
+                                          readonly="loading || vm.isReadOnly"
+                                          form-control="theForm">
+                            </tb-json-form>
+                        </md-card-content>
+                    </md-card>
+                </fieldset>
+            </div>
+        </md-dialog-content>
+        <md-dialog-actions layout="row">
+            <span flex></span>
+            <md-button ng-if="!vm.isReadOnly" ng-disabled="loading || theForm.$invalid || !theForm.$dirty" type="submit"
+                       class="md-raised md-primary">
+                {{ (vm.isAdd ? 'action.add' : 'action.save') | translate }}
+            </md-button>
+            <md-button ng-disabled="loading" ng-click="vm.cancel()" style="margin-right:20px;">{{ 'action.cancel' |
+                translate }}
+            </md-button>
+        </md-dialog-actions>
+    </form>
+</md-dialog>

diff --git a/ui/src/app/component/index.js b/ui/src/app/component/index.js
new file mode 100644
index 0000000..306f7fb
--- /dev/null
+++ b/ui/src/app/component/index.js
@@ -0,0 +1,28 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import thingsboardApiComponentDescriptor from '../api/component-descriptor.service';
+
+import ComponentDialogService from './component-dialog.service';
+import ComponentDialogController from './component-dialog.controller';
+import ComponentDirective from './component.directive';
+
+export default angular.module('thingsboard.component', [
+    thingsboardApiComponentDescriptor
+])
+    .factory('componentDialogService', ComponentDialogService)
+    .controller('ComponentDialogController', ComponentDialogController)
+    .directive('tbComponent', ComponentDirective)
+    .name;

diff --git a/ui/src/app/components/circular-progress.directive.js b/ui/src/app/components/circular-progress.directive.js
new file mode 100644
index 0000000..e384056
--- /dev/null
+++ b/ui/src/app/components/circular-progress.directive.js
@@ -0,0 +1,74 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import $ from 'jquery';
+
+export default angular.module('thingsboard.directives.circularProgress', [])
+    .directive('tbCircularProgress', CircularProgress)
+    .name;
+
+/* eslint-disable angular/angularelement */
+
+/*@ngInject*/
+function CircularProgress($compile) {
+
+    var linker = function (scope, element) {
+
+        var circularProgressElement = angular.element('<md-progress-circular style="margin: auto;" md-mode="indeterminate" md-diameter="20"></md-progress-circular>');
+
+        $compile(circularProgressElement)(scope);
+
+        var children = null;
+        var cssWidth = element.prop('style')['width'];
+        var width = null;
+        if (!cssWidth) {
+            $(element).css('width', width + 'px');
+        }
+
+        scope.$watch('circularProgress', function (newCircularProgress, prevCircularProgress) {
+            if (newCircularProgress != prevCircularProgress) {
+                if (newCircularProgress) {
+                    if (!cssWidth) {
+                        $(element).css('width', '');
+                        width = element.prop('offsetWidth');
+                        $(element).css('width', width + 'px');
+                    }
+                    children = $(element).children();
+                    $(element).empty();
+                    $(element).append($(circularProgressElement));
+                } else {
+                    $(element).empty();
+                    $(element).append(children);
+                    if (cssWidth) {
+                        $(element).css('width', cssWidth);
+                    } else {
+                        $(element).css('width', '');
+                    }
+                }
+            }
+        });
+
+    }
+
+    return {
+        restrict: "A",
+        link: linker,
+        scope: {
+            circularProgress: "=tbCircularProgress"
+        }
+    };
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/confirm-on-exit.directive.js b/ui/src/app/components/confirm-on-exit.directive.js
new file mode 100644
index 0000000..d346b38
--- /dev/null
+++ b/ui/src/app/components/confirm-on-exit.directive.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.directives.confirmOnExit', [])
+    .directive('tbConfirmOnExit', ConfirmOnExit)
+    .name;
+
+/*@ngInject*/
+function ConfirmOnExit($state, $mdDialog, $window, $filter) {
+    return {
+        link: function ($scope) {
+
+            $window.onbeforeunload = function () {
+                if (($scope.confirmForm && $scope.confirmForm.$dirty) || $scope.isDirty) {
+                    return $filter('translate')('confirm-on-exit.message');
+                }
+            }
+            $scope.$on('$stateChangeStart', function (event, next, current, params) {
+                if (($scope.confirmForm && $scope.confirmForm.$dirty) || $scope.isDirty) {
+                    event.preventDefault();
+                    var confirm = $mdDialog.confirm()
+                        .title($filter('translate')('confirm-on-exit.title'))
+                        .htmlContent($filter('translate')('confirm-on-exit.html-message'))
+                        .ariaLabel($filter('translate')('confirm-on-exit.title'))
+                        .cancel($filter('translate')('action.cancel'))
+                        .ok($filter('translate')('action.ok'));
+                    $mdDialog.show(confirm).then(function () {
+                        if ($scope.confirmForm) {
+                            $scope.confirmForm.$setPristine();
+                        } else {
+                            $scope.isDirty = false;
+                        }
+                        $state.go(next.name, params);
+                    }, function () {
+                    });
+                }
+            });
+        },
+        scope: {
+            confirmForm: '=',
+            isDirty: '='
+        }
+    };
+}
\ No newline at end of file

diff --git a/ui/src/app/components/contact.directive.js b/ui/src/app/components/contact.directive.js
new file mode 100644
index 0000000..c88f844
--- /dev/null
+++ b/ui/src/app/components/contact.directive.js
@@ -0,0 +1,300 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import contactTemplate from './contact.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.contact', [])
+    .directive('tbContact', Contact)
+    .name;
+
+/*@ngInject*/
+function Contact($compile, $templateCache) {
+    var countries = [
+        "Afghanistan",
+        "Åland Islands",
+        "Albania",
+        "Algeria",
+        "American Samoa",
+        "Andorra",
+        "Angola",
+        "Anguilla",
+        "Antarctica",
+        "Antigua and Barbuda",
+        "Argentina",
+        "Armenia",
+        "Aruba",
+        "Australia",
+        "Austria",
+        "Azerbaijan",
+        "Bahamas",
+        "Bahrain",
+        "Bangladesh",
+        "Barbados",
+        "Belarus",
+        "Belgium",
+        "Belize",
+        "Benin",
+        "Bermuda",
+        "Bhutan",
+        "Bolivia",
+        "Bonaire, Sint Eustatius and Saba",
+        "Bosnia and Herzegovina",
+        "Botswana",
+        "Bouvet Island",
+        "Brazil",
+        "British Indian Ocean Territory",
+        "Brunei Darussalam",
+        "Bulgaria",
+        "Burkina Faso",
+        "Burundi",
+        "Cambodia",
+        "Cameroon",
+        "Canada",
+        "Cape Verde",
+        "Cayman Islands",
+        "Central African Republic",
+        "Chad",
+        "Chile",
+        "China",
+        "Christmas Island",
+        "Cocos (Keeling) Islands",
+        "Colombia",
+        "Comoros",
+        "Congo",
+        "Congo, The Democratic Republic of the",
+        "Cook Islands",
+        "Costa Rica",
+        "Côte d'Ivoire",
+        "Croatia",
+        "Cuba",
+        "Curaçao",
+        "Cyprus",
+        "Czech Republic",
+        "Denmark",
+        "Djibouti",
+        "Dominica",
+        "Dominican Republic",
+        "Ecuador",
+        "Egypt",
+        "El Salvador",
+        "Equatorial Guinea",
+        "Eritrea",
+        "Estonia",
+        "Ethiopia",
+        "Falkland Islands (Malvinas)",
+        "Faroe Islands",
+        "Fiji",
+        "Finland",
+        "France",
+        "French Guiana",
+        "French Polynesia",
+        "French Southern Territories",
+        "Gabon",
+        "Gambia",
+        "Georgia",
+        "Germany",
+        "Ghana",
+        "Gibraltar",
+        "Greece",
+        "Greenland",
+        "Grenada",
+        "Guadeloupe",
+        "Guam",
+        "Guatemala",
+        "Guernsey",
+        "Guinea",
+        "Guinea-Bissau",
+        "Guyana",
+        "Haiti",
+        "Heard Island and McDonald Islands",
+        "Holy See (Vatican City State)",
+        "Honduras",
+        "Hong Kong",
+        "Hungary",
+        "Iceland",
+        "India",
+        "Indonesia",
+        "Iran, Islamic Republic of",
+        "Iraq",
+        "Ireland",
+        "Isle of Man",
+        "Israel",
+        "Italy",
+        "Jamaica",
+        "Japan",
+        "Jersey",
+        "Jordan",
+        "Kazakhstan",
+        "Kenya",
+        "Kiribati",
+        "Korea, Democratic People's Republic of",
+        "Korea, Republic of",
+        "Kuwait",
+        "Kyrgyzstan",
+        "Lao People's Democratic Republic",
+        "Latvia",
+        "Lebanon",
+        "Lesotho",
+        "Liberia",
+        "Libya",
+        "Liechtenstein",
+        "Lithuania",
+        "Luxembourg",
+        "Macao",
+        "Macedonia, Republic Of",
+        "Madagascar",
+        "Malawi",
+        "Malaysia",
+        "Maldives",
+        "Mali",
+        "Malta",
+        "Marshall Islands",
+        "Martinique",
+        "Mauritania",
+        "Mauritius",
+        "Mayotte",
+        "Mexico",
+        "Micronesia, Federated States of",
+        "Moldova, Republic of",
+        "Monaco",
+        "Mongolia",
+        "Montenegro",
+        "Montserrat",
+        "Morocco",
+        "Mozambique",
+        "Myanmar",
+        "Namibia",
+        "Nauru",
+        "Nepal",
+        "Netherlands",
+        "New Caledonia",
+        "New Zealand",
+        "Nicaragua",
+        "Niger",
+        "Nigeria",
+        "Niue",
+        "Norfolk Island",
+        "Northern Mariana Islands",
+        "Norway",
+        "Oman",
+        "Pakistan",
+        "Palau",
+        "Palestinian Territory, Occupied",
+        "Panama",
+        "Papua New Guinea",
+        "Paraguay",
+        "Peru",
+        "Philippines",
+        "Pitcairn",
+        "Poland",
+        "Portugal",
+        "Puerto Rico",
+        "Qatar",
+        "Reunion",
+        "Romania",
+        "Russian Federation",
+        "Rwanda",
+        "Saint Barthélemy",
+        "Saint Helena, Ascension and Tristan da Cunha",
+        "Saint Kitts and Nevis",
+        "Saint Lucia",
+        "Saint Martin (French Part)",
+        "Saint Pierre and Miquelon",
+        "Saint Vincent and the Grenadines",
+        "Samoa",
+        "San Marino",
+        "Sao Tome and Principe",
+        "Saudi Arabia",
+        "Senegal",
+        "Serbia",
+        "Seychelles",
+        "Sierra Leone",
+        "Singapore",
+        "Sint Maarten (Dutch Part)",
+        "Slovakia",
+        "Slovenia",
+        "Solomon Islands",
+        "Somalia",
+        "South Africa",
+        "South Georgia and the South Sandwich Islands",
+        "South Sudan",
+        "Spain",
+        "Sri Lanka",
+        "Sudan",
+        "Suriname",
+        "Svalbard and Jan Mayen",
+        "Swaziland",
+        "Sweden",
+        "Switzerland",
+        "Syrian Arab Republic",
+        "Taiwan",
+        "Tajikistan",
+        "Tanzania, United Republic of",
+        "Thailand",
+        "Timor-Leste",
+        "Togo",
+        "Tokelau",
+        "Tonga",
+        "Trinidad and Tobago",
+        "Tunisia",
+        "Turkey",
+        "Turkmenistan",
+        "Turks and Caicos Islands",
+        "Tuvalu",
+        "Uganda",
+        "Ukraine",
+        "United Arab Emirates",
+        "United Kingdom",
+        "United States",
+        "United States Minor Outlying Islands",
+        "Uruguay",
+        "Uzbekistan",
+        "Vanuatu",
+        "Venezuela",
+        "Viet Nam",
+        "Virgin Islands, British",
+        "Virgin Islands, U.S.",
+        "Wallis and Futuna",
+        "Western Sahara",
+        "Yemen",
+        "Zambia",
+        "Zimbabwe"
+    ];
+
+    var linker = function (scope, element) {
+
+        scope.countries = countries;
+
+        var template = $templateCache.get(contactTemplate);
+
+        element.html(template);
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        link: linker,
+        scope: {
+            contact: '=',
+            isEdit: '=',
+            theForm: '='
+        }
+    };
+}

diff --git a/ui/src/app/components/contact.tpl.html b/ui/src/app/components/contact.tpl.html
new file mode 100644
index 0000000..8eb0fdd
--- /dev/null
+++ b/ui/src/app/components/contact.tpl.html
@@ -0,0 +1,59 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-input-container class="md-block">
+	<label translate>contact.country</label>
+    <md-select ng-disabled="!isEdit" name="country" ng-model="contact.country">
+       <md-option ng-repeat="country in countries" value="{{country}}">
+         {{country}}
+       </md-option>
+    </md-select>
+</md-input-container>	
+<div layout-gt-sm="row">
+	<md-input-container class="md-block">
+		<label translate>contact.city</label>
+		<input name="city" ng-model="contact.city">	
+	</md-input-container>					
+	<md-input-container class="md-block">
+		<label translate>contact.state</label>
+		<input name="state" ng-model="contact.state">	
+	</md-input-container>					
+	<md-input-container class="md-block">
+		<label translate>contact.postal-code</label>
+		<input name="zip" ng-model="contact.zip" ng-pattern="/^([0-9]*)$/">	
+	    <div ng-messages="theForm.zip.$error" role="alert" multiple>
+	      <div translate ng-message="pattern">contact.postal-code-invalid</div>
+	    </div>	
+	</md-input-container>	
+</div>				
+<md-input-container class="md-block">
+	<label translate>contact.address</label>
+	<input name="address" ng-model="contact.address">	
+</md-input-container>					
+<md-input-container class="md-block">
+	<label translate>contact.address2</label>
+	<input name="address2" ng-model="contact.address2">	
+</md-input-container>					
+<md-input-container class="md-block">
+	<label translate>contact.phone</label>
+	<input name="phone" ng-model="contact.phone">	
+</md-input-container>					
+<md-input-container class="md-block">
+	<label translate>contact.email</label>
+	<input name="email" type="email" ng-model="contact.email">	
+</md-input-container>					
+	
\ No newline at end of file

diff --git a/ui/src/app/components/contact-short.filter.js b/ui/src/app/components/contact-short.filter.js
new file mode 100644
index 0000000..80c2c93
--- /dev/null
+++ b/ui/src/app/components/contact-short.filter.js
@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.filters.contactShort', [])
+    .filter('contactShort', ContactShort)
+    .name;
+
+/*@ngInject*/
+function ContactShort($filter) {
+    return function (contact) {
+        var contactShort = '';
+        if (contact) {
+            if (contact.address) {
+                contactShort += contact.address;
+                contactShort += ' ';
+            }
+            if (contact.address2) {
+                contactShort += contact.address2;
+                contactShort += ' ';
+            }
+            if (contact.city) {
+                contactShort += contact.city;
+                contactShort += ' ';
+            }
+            if (contact.state) {
+                contactShort += contact.state;
+                contactShort += ' ';
+            }
+            if (contact.zip) {
+                contactShort += contact.zip;
+                contactShort += ' ';
+            }
+            if (contact.country) {
+                contactShort += contact.country;
+            }
+        }
+        if (contactShort === '') {
+            contactShort = $filter('translate')('contact.no-address');
+        }
+        return contactShort;
+    };
+}

diff --git a/ui/src/app/components/dashboard.directive.js b/ui/src/app/components/dashboard.directive.js
new file mode 100644
index 0000000..ce7668f
--- /dev/null
+++ b/ui/src/app/components/dashboard.directive.js
@@ -0,0 +1,427 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './dashboard.scss';
+
+import $ from 'jquery';
+import gridster from 'angular-gridster';
+import thingsboardTypes from '../common/types.constant';
+import thingsboardApiWidget from '../api/widget.service';
+import thingsboardWidget from './widget.directive';
+import thingsboardToast from '../services/toast';
+import thingsboardTimewindow from './timewindow.directive';
+import thingsboardEvents from './tb-event-directives';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import dashboardTemplate from './dashboard.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/* eslint-disable angular/angularelement */
+
+export default angular.module('thingsboard.directives.dashboard', [thingsboardTypes,
+    thingsboardToast,
+    thingsboardApiWidget,
+    thingsboardWidget,
+    thingsboardTimewindow,
+    thingsboardEvents,
+    gridster.name])
+    .directive('tbDashboard', Dashboard)
+    .name;
+
+/*@ngInject*/
+function Dashboard() {
+    return {
+        restrict: "E",
+        scope: true,
+        bindToController: {
+            widgets: '=',
+            deviceAliasList: '=',
+            columns: '=',
+            isEdit: '=',
+            isMobile: '=',
+            isMobileDisabled: '=?',
+            isEditActionEnabled: '=',
+            isRemoveActionEnabled: '=',
+            onEditWidget: '&?',
+            onRemoveWidget: '&?',
+            onWidgetClicked: '&?',
+            loadWidgets: '&?',
+            onInit: '&?',
+            onInitFailed: '&?'
+        },
+        controller: DashboardController,
+        controllerAs: 'vm',
+        templateUrl: dashboardTemplate
+    };
+}
+
+/*@ngInject*/
+function DashboardController($scope, $rootScope, $element, $timeout, $log, toast, types) {
+
+    var highlightedMode = false;
+    var highlightedIndex = -1;
+    var mouseDownIndex = -1;
+    var widgetMouseMoved = false;
+
+    var gridsterParent = null;
+    var gridsterElement = null;
+    var gridster = null;
+
+    var vm = this;
+
+    vm.isMobileDisabled = angular.isDefined(vm.isMobileDisabled) ? vm.isMobileDisabled : false;
+
+    vm.dashboardLoading = true;
+    vm.visibleRect = {
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0
+    };
+    vm.gridsterOpts = {
+        floating: false,
+        maxRows: 100,
+        columns: vm.columns ? vm.columns : 24,
+        minSizeX: 2,
+        minSizeY: 2,
+        defaultSizeX: 8,
+        defaultSizeY: 6,
+        resizable: {
+            enabled: vm.isEdit
+        },
+        draggable: {
+            enabled: vm.isEdit
+        },
+        isMobile: vm.isMobileDisabled ? false : vm.isMobile,
+        mobileBreakPoint: vm.isMobileDisabled ? 0 : (vm.isMobile ? 20000 : 960),
+        margins: [10, 10],
+        saveGridItemCalculatedHeightInMobile: true
+    };
+
+    vm.isWidgetExpanded = false;
+    vm.isHighlighted = isHighlighted;
+    vm.isNotHighlighted = isNotHighlighted;
+    vm.highlightWidget = highlightWidget;
+    vm.resetHighlight = resetHighlight;
+
+    vm.onWidgetFullscreenChanged = onWidgetFullscreenChanged;
+    vm.widgetMouseDown = widgetMouseDown;
+    vm.widgetMouseMove = widgetMouseMove;
+    vm.widgetMouseUp = widgetMouseUp;
+
+    vm.widgetColor = widgetColor;
+    vm.widgetBackgroundColor = widgetBackgroundColor;
+    vm.widgetPadding = widgetPadding;
+    vm.showWidgetTitle = showWidgetTitle;
+    vm.hasTimewindow = hasTimewindow;
+    vm.editWidget = editWidget;
+    vm.removeWidget = removeWidget;
+    vm.loading = loading;
+
+    //$element[0].onmousemove=function(){
+    //    widgetMouseMove();
+   // }
+
+    gridsterParent = $('#gridster-parent', $element);
+    gridsterElement = angular.element($('#gridster-child', gridsterParent));
+
+    gridsterParent.scroll(function () {
+        updateVisibleRect();
+    });
+
+    gridsterParent.resize(function () {
+        updateVisibleRect();
+    });
+
+    $scope.$watch('vm.isMobile', function () {
+        vm.gridsterOpts.isMobile = vm.isMobileDisabled ? false : vm.isMobile;
+        vm.gridsterOpts.mobileBreakPoint = vm.isMobileDisabled ? 0 : (vm.isMobile ? 20000 : 960);
+    });
+
+    $scope.$watch('vm.isMobileDisabled', function () {
+        vm.gridsterOpts.isMobile = vm.isMobileDisabled ? false : vm.isMobile;
+        vm.gridsterOpts.mobileBreakPoint = vm.isMobileDisabled ? 0 : (vm.isMobile ? 20000 : 960);
+    });
+
+    $scope.$watch('vm.columns', function () {
+        vm.gridsterOpts.columns = vm.columns ? vm.columns : 24;
+    });
+
+    $scope.$watch('vm.isEdit', function () {
+        vm.gridsterOpts.resizable.enabled = vm.isEdit;
+        vm.gridsterOpts.draggable.enabled = vm.isEdit;
+        $scope.$broadcast('toggleDashboardEditMode', vm.isEdit);
+    });
+
+    $scope.$watch('vm.deviceAliasList', function () {
+        $scope.$broadcast('deviceAliasListChanged', vm.deviceAliasList);
+    }, true);
+
+    $scope.$on('gridster-resized', function (event, sizes, theGridster) {
+        if (checkIsLocalGridsterElement(theGridster)) {
+            gridster = theGridster;
+            updateVisibleRect(false, true);
+        }
+    });
+
+    $scope.$on('gridster-mobile-changed', function (event, theGridster) {
+        if (checkIsLocalGridsterElement(theGridster)) {
+            gridster = theGridster;
+            if (gridster.isMobile) {
+                vm.gridsterOpts.rowHeight = 70;
+            } else {
+                vm.gridsterOpts.rowHeight = 'match';
+            }
+            $timeout(function () {
+                updateVisibleRect(true);
+            }, 500, false);
+        }
+    });
+
+    $scope.$on('widgetPositionChanged', function () {
+        vm.widgets.sort(function (widget1, widget2) {
+            var res = widget1.row - widget2.row;
+            if (res === 0) {
+                res = widget1.col - widget2.col;
+            }
+            return res;
+        });
+    });
+
+    loadDashboard();
+
+    function loadDashboard() {
+        resetWidgetClick();
+        $timeout(function () {
+            if (vm.loadWidgets) {
+                var promise = vm.loadWidgets();
+                if (promise) {
+                    promise.then(function () {
+                        dashboardLoaded();
+                    }, function () {
+                        dashboardLoaded();
+                    });
+                } else {
+                    dashboardLoaded();
+                }
+            } else {
+                dashboardLoaded();
+            }
+        }, 0, false);
+    }
+
+    function updateVisibleRect (force, containerResized) {
+        if (gridster) {
+            var position = $(gridster.$element).position()
+            if (position) {
+                var viewportWidth = gridsterParent.width();
+                var viewportHeight = gridsterParent.height();
+                var top = -position.top;
+                var bottom = top + viewportHeight;
+                var left = -position.left;
+                var right = left + viewportWidth;
+
+                var newVisibleRect = {
+                    top: gridster.pixelsToRows(top),
+                    topPx: top,
+                    bottom: gridster.pixelsToRows(bottom),
+                    bottomPx: bottom,
+                    left: gridster.pixelsToColumns(left),
+                    right: gridster.pixelsToColumns(right),
+                    isMobile: gridster.isMobile,
+                    curRowHeight: gridster.curRowHeight,
+                    containerResized: containerResized
+                };
+
+                if (force ||
+                    newVisibleRect.top != vm.visibleRect.top ||
+                    newVisibleRect.topPx != vm.visibleRect.topPx ||
+                    newVisibleRect.bottom != vm.visibleRect.bottom ||
+                    newVisibleRect.bottomPx != vm.visibleRect.bottomPx ||
+                    newVisibleRect.left != vm.visibleRect.left ||
+                    newVisibleRect.right != vm.visibleRect.right ||
+                    newVisibleRect.isMobile != vm.visibleRect.isMobile ||
+                    newVisibleRect.curRowHeight != vm.visibleRect.curRowHeight ||
+                    newVisibleRect.containerResized != vm.visibleRect.containerResized) {
+                    vm.visibleRect = newVisibleRect;
+                    $scope.$broadcast('visibleRectChanged', vm.visibleRect);
+                }
+            }
+        }
+    }
+
+    function checkIsLocalGridsterElement (gridster) {
+        return gridsterElement[0] == gridster.$element[0];
+    }
+
+    function resetWidgetClick () {
+        mouseDownIndex = -1;
+        widgetMouseMoved = false;
+    }
+
+    function onWidgetFullscreenChanged(expanded, widget) {
+        vm.isWidgetExpanded = expanded;
+        $scope.$broadcast('onWidgetFullscreenChanged', vm.isWidgetExpanded, widget);
+    }
+
+    function widgetMouseDown ($event, widget) {
+        mouseDownIndex = vm.widgets.indexOf(widget);
+        widgetMouseMoved = false;
+    }
+
+    function widgetMouseMove () {
+        if (mouseDownIndex > -1) {
+            widgetMouseMoved = true;
+        }
+    }
+
+    function widgetMouseUp ($event, widget) {
+        $timeout(function () {
+            if (!widgetMouseMoved && mouseDownIndex > -1) {
+                var index = vm.widgets.indexOf(widget);
+                if (index === mouseDownIndex) {
+                    widgetClicked($event, widget);
+                }
+            }
+            mouseDownIndex = -1;
+            widgetMouseMoved = false;
+        }, 0);
+    }
+
+    function widgetClicked ($event, widget) {
+        if ($event) {
+            $event.stopPropagation();
+        }
+        if (vm.onWidgetClicked) {
+            vm.onWidgetClicked({event: $event, widget: widget});
+        }
+    }
+
+    function editWidget ($event, widget) {
+        resetWidgetClick();
+        if ($event) {
+            $event.stopPropagation();
+        }
+        if (vm.isEditActionEnabled && vm.onEditWidget) {
+            vm.onEditWidget({event: $event, widget: widget});
+        }
+    }
+
+    function removeWidget($event, widget) {
+        resetWidgetClick();
+        if ($event) {
+            $event.stopPropagation();
+        }
+        if (vm.isRemoveActionEnabled && vm.onRemoveWidget) {
+            vm.onRemoveWidget({event: $event, widget: widget});
+        }
+    }
+
+    function highlightWidget(widgetIndex, delay) {
+        highlightedMode = true;
+        highlightedIndex = widgetIndex;
+        var item = $('.gridster-item', gridster.$element)[widgetIndex];
+        if (item) {
+            var height = $(item).outerHeight(true);
+            var rectHeight = gridsterParent.height();
+            var offset = (rectHeight - height) / 2;
+            var scrollTop = item.offsetTop;
+            if (offset > 0) {
+                scrollTop -= offset;
+            }
+            gridsterParent.animate({
+                scrollTop: scrollTop
+            }, delay);
+        }
+    }
+
+    function resetHighlight() {
+        highlightedMode = false;
+        highlightedIndex = -1;
+    }
+
+    function isHighlighted(widget) {
+        return highlightedMode && vm.widgets.indexOf(widget) === highlightedIndex;
+    }
+
+    function isNotHighlighted(widget) {
+        return highlightedMode && vm.widgets.indexOf(widget) != highlightedIndex;
+    }
+
+    function widgetColor(widget) {
+        if (widget.config.color) {
+            return widget.config.color;
+        } else {
+            return 'rgba(0, 0, 0, 0.87)';
+        }
+    }
+
+    function widgetBackgroundColor(widget) {
+        if (widget.config.backgroundColor) {
+            return widget.config.backgroundColor;
+        } else {
+            return '#fff';
+        }
+    }
+
+    function widgetPadding(widget) {
+        if (widget.config.padding) {
+            return widget.config.padding;
+        } else {
+            return '8px';
+        }
+    }
+
+    function showWidgetTitle(widget) {
+        if (angular.isDefined(widget.config.showTitle)) {
+            return widget.config.showTitle;
+        } else {
+            return true;
+        }
+    }
+
+    function hasTimewindow(widget) {
+        return widget.type === types.widgetType.timeseries.value;
+    }
+
+    function adoptMaxRows() {
+        if (vm.widgets) {
+            var maxRows = vm.gridsterOpts.maxRows;
+            for (var i = 0; i < vm.widgets.length; i++) {
+                var w = vm.widgets[i];
+                var bottom = w.row + w.sizeY;
+                maxRows = Math.max(maxRows, bottom);
+            }
+            vm.gridsterOpts.maxRows = Math.max(maxRows, vm.gridsterOpts.maxRows);
+        }
+    }
+
+    function dashboardLoaded() {
+        adoptMaxRows();
+        vm.dashboardLoading = false;
+        if (vm.onInit) {
+            vm.onInit({dashboard: vm});
+        }
+    }
+
+    function loading() {
+        return $rootScope.loading;
+    }
+
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/dashboard.scss b/ui/src/app/components/dashboard.scss
new file mode 100644
index 0000000..1b08cdd
--- /dev/null
+++ b/ui/src/app/components/dashboard.scss
@@ -0,0 +1,108 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import "~compass-sass-mixins/lib/compass";
+
+div.tb-widget {
+  position: relative;
+  height: 100%;
+  margin: 0;
+  overflow: hidden;
+  @include transition(all .2s ease-in-out);
+
+  .tb-widget-title {
+    max-height: 60px;
+
+    padding-top: 5px;
+    padding-left: 5px;
+    overflow: hidden;
+
+    tb-timewindow {
+      font-size: 14px;
+      opacity: 0.85;
+    }
+  }
+
+  .tb-widget-actions {
+    position: absolute;
+    top: 8px;
+    right: 8px;
+    z-index: 1;
+    margin: 0px;
+
+    .md-button.md-icon-button {
+      margin: 0px !important;
+      padding: 0px !important;
+      line-height: 20px;
+      width: 32px;
+      height: 32px;
+      min-width: 32px;
+      min-height: 32px;
+      md-icon {
+        width: 20px;
+        height: 20px;
+        min-width: 20px;
+        min-height: 20px;
+        font-size: 20px;
+      }
+    }
+  }
+
+  .tb-widget-content {
+    tb-widget {
+      width: 100%;
+      position: relative;
+    }
+  }
+}
+
+div.tb-widget.tb-highlighted {
+  border: 1px solid #039be5;
+  box-shadow: 0 0 20px #039be5;
+}
+
+div.tb-widget.tb-not-highlighted {
+  opacity: 0.5;
+}
+
+tb-dashboard {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+md-content.tb-dashboard-content {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+
+.tb-widget-error-container {
+  position: absolute;
+  background-color: #fff;
+  width: 100%;
+  height: 100%;
+}
+
+.tb-widget-error-msg {
+  color: red;
+  font-size: 16px;
+  word-wrap: break-word;
+  padding: 5px;
+}

diff --git a/ui/src/app/components/dashboard.tpl.html b/ui/src/app/components/dashboard.tpl.html
new file mode 100644
index 0000000..1127cb0
--- /dev/null
+++ b/ui/src/app/components/dashboard.tpl.html
@@ -0,0 +1,80 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-content flex layout="column" class="tb-progress-cover" layout-align="center center"
+   ng-show="(vm.loading() || vm.dashboardLoading) && !vm.isEdit">
+	<md-progress-circular md-mode="indeterminate" class="md-warn" md-diameter="100"></md-progress-circular>
+</md-content>
+<md-content id="gridster-parent" class="tb-dashboard-content" flex layout-wrap>
+	<div id="gridster-child" gridster="vm.gridsterOpts">
+		<ul>
+<!-- 			    			ng-click="widgetClicked($event, widget)"  --> 
+			<li gridster-item="widget" ng-repeat="widget in vm.widgets">
+			    <div tb-expand-fullscreen expand-button-id="expand-button" on-fullscreen-changed="vm.onWidgetFullscreenChanged(expanded, widget)" layout="column" class="tb-widget md-whiteframe-4dp"
+			    			ng-class="{'tb-highlighted': vm.isHighlighted(widget), 'tb-not-highlighted': vm.isNotHighlighted(widget)}"
+					 		tb-mousedown="vm.widgetMouseDown($event, widget)"
+					 		tb-mousemove="vm.widgetMouseMove($event, widget)"
+			    			tb-mouseup="vm.widgetMouseUp($event, widget)"
+			        style="
+			        cursor: pointer;
+			        color: {{vm.widgetColor(widget)}};
+			        background-color: {{vm.widgetBackgroundColor(widget)}};
+			        padding: {{vm.widgetPadding(widget)}}
+			        ">
+			    	<div class="tb-widget-title" layout="column" ng-show="vm.showWidgetTitle(widget) || vm.hasTimewindow(widget)">
+			    		<span ng-show="vm.showWidgetTitle(widget)" class="md-subhead">{{widget.config.title}}</span>
+				    	<tb-timewindow ng-if="vm.hasTimewindow(widget)" ng-model="widget.config.timewindow"></tb-timewindow>
+			    	</div>
+					<div class="tb-widget-actions" layout="row" layout-align="start center">
+						<md-button id="expand-button"
+								   aria-label="{{ 'fullscreen.fullscreen' | translate }}"
+								   class="md-icon-button md-primary"></md-button>
+						<md-button ng-show="vm.isEditActionEnabled && !vm.isWidgetExpanded"
+								   ng-disabled="vm.loading()"
+								   class="md-icon-button md-primary"
+								   ng-click="vm.editWidget($event, widget)"
+								   aria-label="{{ 'widget.edit' | translate }}">
+							<md-tooltip md-direction="top">
+								{{ 'widget.edit' | translate }}
+							</md-tooltip>
+							<md-icon class="material-icons">
+								edit
+							</md-icon>
+						</md-button>
+						<md-button ng-show="vm.isRemoveActionEnabled && !vm.isWidgetExpanded"
+				            ng-disabled="vm.loading()"
+				            class="md-icon-button md-primary"
+				            ng-click="vm.removeWidget($event, widget)"
+				            aria-label="{{ 'widget.remove' | translate }}">
+			                <md-tooltip md-direction="top">
+          						{{ 'widget.remove' | translate }}
+        					</md-tooltip>
+					        <md-icon class="material-icons">
+					          close
+					        </md-icon>		        					
+				        </md-button>	 						
+					</div>		    		
+			    	<div flex layout="column" class="tb-widget-content">
+			        	<div flex tb-widget
+			        		 locals="{ visibleRect: vm.visibleRect, widget: widget, deviceAliasList: vm.deviceAliasList, isPreview: vm.isEdit }">
+						</div>
+			    	</div>
+			    </div>
+			</li>
+		</ul>
+	</div>
+</md-content>
\ No newline at end of file

diff --git a/ui/src/app/components/dashboard-select.directive.js b/ui/src/app/components/dashboard-select.directive.js
new file mode 100644
index 0000000..8f007a7
--- /dev/null
+++ b/ui/src/app/components/dashboard-select.directive.js
@@ -0,0 +1,114 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './dashboard-select.scss';
+
+import thingsboardApiDashboard from '../api/dashboard.service';
+import thingsboardApiUser from '../api/user.service';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import dashboardSelectTemplate from './dashboard-select.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+
+export default angular.module('thingsboard.directives.dashboardSelect', [thingsboardApiDashboard, thingsboardApiUser])
+    .directive('tbDashboardSelect', DashboardSelect)
+    .name;
+
+/*@ngInject*/
+function DashboardSelect($compile, $templateCache, $q, dashboardService, userService) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var template = $templateCache.get(dashboardSelectTemplate);
+        element.html(template);
+
+        scope.tbRequired = angular.isDefined(scope.tbRequired) ? scope.tbRequired : false;
+        scope.dashboard = null;
+        scope.dashboardSearchText = '';
+
+        scope.dashboardFetchFunction = dashboardService.getTenantDashboards;
+        if (angular.isDefined(scope.dashboardsScope)) {
+            if (scope.dashboardsScope === 'customer') {
+                scope.dashboardFetchFunction = dashboardService.getCustomerDashboards;
+            } else {
+                scope.dashboardFetchFunction = dashboardService.getTenantDashboards;
+            }
+        } else {
+            if (userService.getAuthority() === 'TENANT_ADMIN') {
+                scope.dashboardFetchFunction = dashboardService.getTenantDashboards;
+            } else if (userService.getAuthority() === 'CUSTOMER_USER') {
+                scope.dashboardFetchFunction = dashboardService.getCustomerDashboards;
+            }
+        }
+
+        scope.fetchDashboards = function(searchText) {
+            var pageLink = {limit: 10, textSearch: searchText};
+
+            var deferred = $q.defer();
+
+            scope.dashboardFetchFunction(pageLink).then(function success(result) {
+                deferred.resolve(result.data);
+            }, function fail() {
+                deferred.reject();
+            });
+
+            return deferred.promise;
+        }
+
+        scope.dashboardSearchTextChanged = function() {
+        }
+
+        scope.updateView = function () {
+            ngModelCtrl.$setViewValue(scope.dashboard);
+        }
+
+        ngModelCtrl.$render = function () {
+            if (ngModelCtrl.$viewValue) {
+                scope.dashboard = ngModelCtrl.$viewValue;
+            }
+        }
+
+        scope.$watch('dashboard', function () {
+            scope.updateView();
+        });
+
+        if (scope.selectFirstDashboard) {
+            var pageLink = {limit: 1, textSearch: ''};
+            scope.dashboardFetchFunction(pageLink).then(function success(result) {
+                var dashboards = result.data;
+                if (dashboards.length > 0) {
+                    scope.dashboard = dashboards[0];
+                }
+            }, function fail() {
+            });
+        }
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        link: linker,
+        scope: {
+            dashboardsScope: '@',
+            theForm: '=?',
+            tbRequired: '=?',
+            selectFirstDashboard: '='
+        }
+    };
+}

diff --git a/ui/src/app/components/dashboard-select.scss b/ui/src/app/components/dashboard-select.scss
new file mode 100644
index 0000000..63ad8ce
--- /dev/null
+++ b/ui/src/app/components/dashboard-select.scss
@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.tb-dashboard-autocomplete {
+  .tb-not-found {
+    display: block;
+    line-height: 1.5;
+    height: 48px;
+  }
+  .tb-dashboard-item {
+    display: block;
+    height: 48px;
+  }
+  li {
+    height: auto !important;
+    white-space: normal !important;
+  }
+}

diff --git a/ui/src/app/components/dashboard-select.tpl.html b/ui/src/app/components/dashboard-select.tpl.html
new file mode 100644
index 0000000..32eb12f
--- /dev/null
+++ b/ui/src/app/components/dashboard-select.tpl.html
@@ -0,0 +1,42 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-autocomplete ng-required="tbRequired"
+                 md-input-name="dashboard"
+                 ng-model="dashboard"
+                 md-selected-item="dashboard"
+                 md-search-text="dashboardSearchText"
+                 md-search-text-change="dashboardSearchTextChanged()"
+                 md-items="item in fetchDashboards(dashboardSearchText)"
+                 md-item-text="item.title"
+                 md-min-length="0"
+                 placeholder="{{ 'dashboard.select-dashboard' | translate }}"
+                 md-menu-class="tb-dashboard-autocomplete">
+    <md-item-template>
+        <div class="tb-dashboard-item">
+            <span md-highlight-text="dashboardSearchText" md-highlight-flags="^i">{{item.title}}</span>
+        </div>
+    </md-item-template>
+    <md-not-found>
+        <div class="tb-not-found">
+            <span translate translate-values='{ dashboard: dashboardSearchText }'>dashboard.no-dashboards-matching</span>
+        </div>
+    </md-not-found>
+    <div ng-messages="theForm.dashboard.$error">
+        <div translate ng-message="required">dashboard.dashboard-required</div>
+    </div>
+</md-autocomplete>

diff --git a/ui/src/app/components/datakey-config.directive.js b/ui/src/app/components/datakey-config.directive.js
new file mode 100644
index 0000000..0ae91ae
--- /dev/null
+++ b/ui/src/app/components/datakey-config.directive.js
@@ -0,0 +1,139 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './datakey-config.scss';
+
+import thingsboardJsonForm from "./json-form.directive";
+import thingsboardTypes from '../common/types.constant';
+import thingsboardJsFunc from './js-func.directive';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import datakeyConfigTemplate from './datakey-config.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.datakeyConfig', [thingsboardTypes, thingsboardJsFunc, thingsboardJsonForm])
+    .directive('tbDatakeyConfig', DatakeyConfig)
+    .name;
+
+/*@ngInject*/
+function DatakeyConfig($compile, $templateCache, $q, types) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var template = $templateCache.get(datakeyConfigTemplate);
+
+        if (scope.datakeySettingsSchema.schema) {
+            scope.dataKeySchema = scope.datakeySettingsSchema.schema;
+            scope.dataKeyForm = scope.datakeySettingsSchema.form || ['*'];
+            template = '<md-tabs md-border-bottom class="tb-datakey-config">\n' +
+                '<md-tab label="{{\'datakey.settings\' | translate}}">\n' +
+                template +
+                '</md-tab>\n' +
+                '<md-tab label="{{\'datakey.advanced\' | translate}}">\n' +
+                '<md-content class="md-padding" layout="column">\n' +
+                '<div style="overflow: auto;">\n' +
+                '<ng-form name="ngform" ' +
+                'layout="column" ' +
+                'layout-padding>' +
+                '<tb-json-form schema="dataKeySchema"' +
+                'form="dataKeyForm"' +
+                'model="model.settings"' +
+                'form-control="ngform">' +
+                '</tb-json-form>' +
+                '</ng-form>\n' +
+                '</div>\n' +
+                '</md-content>\n' +
+                '</md-tab>\n' +
+                '</md-tabs>';
+        }
+
+        element.html(template);
+
+        scope.types = types;
+        scope.selectedKey = null;
+        scope.keySearchText = null;
+        scope.usePostProcessing = false;
+
+        scope.functions = {};
+
+        ngModelCtrl.$render = function () {
+            scope.model = {};
+            if (ngModelCtrl.$viewValue) {
+                scope.model.type = ngModelCtrl.$viewValue.type;
+                scope.model.name = ngModelCtrl.$viewValue.name;
+                scope.model.label = ngModelCtrl.$viewValue.label;
+                scope.model.color = ngModelCtrl.$viewValue.color;
+                scope.model.funcBody = ngModelCtrl.$viewValue.funcBody;
+                scope.model.postFuncBody = ngModelCtrl.$viewValue.postFuncBody;
+                scope.model.usePostProcessing = scope.model.postFuncBody ? true : false;
+                scope.model.settings = ngModelCtrl.$viewValue.settings;
+            }
+        };
+
+        scope.$watch('model', function (newVal, oldVal) {
+            if (newVal.usePostProcessing != oldVal.usePostProcessing) {
+                if (scope.model.usePostProcessing && !scope.model.postFuncBody) {
+                    scope.model.postFuncBody = "return value;";
+                } else if (!scope.model.usePostProcessing && scope.model.postFuncBody) {
+                    delete scope.model.postFuncBody;
+                }
+            }
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                value.type = scope.model.type;
+                value.name = scope.model.name;
+                value.label = scope.model.label;
+                value.color = scope.model.color;
+                value.funcBody = scope.model.funcBody;
+                if (!scope.model.postFuncBody) {
+                    delete value.postFuncBody;
+                } else {
+                    value.postFuncBody = scope.model.postFuncBody;
+                }
+                ngModelCtrl.$setViewValue(value);
+            }
+        }, true);
+
+        scope.keysSearch = function (searchText) {
+            if (scope.deviceAlias) {
+                var deferred = $q.defer();
+                scope.fetchDeviceKeys({deviceAliasId: scope.deviceAlias.id, query: searchText, type: scope.model.type})
+                    .then(function (keys) {
+                        keys.push(searchText);
+                        deferred.resolve(keys);
+                    }, function (e) {
+                        deferred.reject(e);
+                    });
+                return deferred.promise;
+            } else {
+                return $q.when([]);
+            }
+        };
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: 'E',
+        require: '^ngModel',
+        scope: {
+            deviceAlias: '=',
+            fetchDeviceKeys: '&',
+            datakeySettingsSchema: '='
+        },
+        link: linker
+    };
+}
\ No newline at end of file

diff --git a/ui/src/app/components/datakey-config.scss b/ui/src/app/components/datakey-config.scss
new file mode 100644
index 0000000..2fe24fe
--- /dev/null
+++ b/ui/src/app/components/datakey-config.scss
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.tb-datakey-config {
+  min-width: 500px !important;
+  min-height: 500px !important;
+  md-content {
+    background-color: #fff;
+  }
+}
+
+tb-datakey-config {
+  md-content {
+    background-color: #fff;
+  }
+}

diff --git a/ui/src/app/components/datakey-config.tpl.html b/ui/src/app/components/datakey-config.tpl.html
new file mode 100644
index 0000000..eecaa5a
--- /dev/null
+++ b/ui/src/app/components/datakey-config.tpl.html
@@ -0,0 +1,71 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-content class="md-padding" layout="column">
+    <md-autocomplete ng-if="model.type === types.dataKeyType.timeseries || model.type === types.dataKeyType.attribute"
+    	   style="padding-bottom: 8px;"
+           ng-required="true"
+   		   md-no-cache="true"
+   		   id="key"
+   		   ng-model="model.name"
+		   md-selected-item="model.name"
+		   md-search-text="keySearchText"
+		   md-items="item in keysSearch(keySearchText)"
+	 	   md-item-text="item"
+		   md-min-length="0"
+           placeholder="Key name"
+           md-floating-label="Key">
+           <span md-highlight-text="keySearchText" md-highlight-flags="^i">{{item}}</span>
+    </md-autocomplete>
+	<div layout="row" layout-align="start center">     
+		<md-input-container flex class="md-block">
+			<label translate>datakey.label</label>
+			<input ng-required="true" name="label" ng-model="model.label">	
+		</md-input-container>
+		<div flex md-color-picker
+		    ng-required="true"
+		    ng-model="model.color"
+		    label="{{ 'datakey.color' | translate }}"
+		    icon="format_color_fill"
+		    default="#999"
+		    md-color-clear-button="false"
+		    open-on-input="true"
+		    md-color-generic-palette="false"
+		    md-color-history="false">
+		</div>    
+	</div>
+	<section layout="column" ng-if="model.type === types.dataKeyType.function">
+		<span translate>datakey.data-generation-func</span>
+		<br/>
+		<tb-js-func ng-model="model.funcBody"
+				 function-args="{{ ['time', 'prevValue'] }}"
+				 validation-args="{{ [1, 1] }}"
+				 result-type="any">
+		</tb-js-func>
+	</section>	
+	<section layout="column" ng-if="model.type === types.dataKeyType.timeseries || model.type === types.dataKeyType.attribute">
+        <md-checkbox ng-model="model.usePostProcessing" aria-label="{{ 'datakey.use-data-post-processing-func' | translate }}">
+			{{ 'datakey.use-data-post-processing-func' | translate }}
+        </md-checkbox>		
+		<tb-js-func ng-if="model.usePostProcessing"
+		         ng-model="model.postFuncBody"
+				 function-args="{{ ['time', 'value', 'prevValue'] }}"
+				 validation-args="{{ [1, 1, 1] }}"
+				 result-type="any">
+		</tb-js-func>
+	</section>
+</md-content>
\ No newline at end of file

diff --git a/ui/src/app/components/datakey-config-dialog.controller.js b/ui/src/app/components/datakey-config-dialog.controller.js
new file mode 100644
index 0000000..a041ed9
--- /dev/null
+++ b/ui/src/app/components/datakey-config-dialog.controller.js
@@ -0,0 +1,56 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import thingsboardDatakeyConfig from './datakey-config.directive';
+
+export default angular.module('thingsboard.dialogs.datakeyConfigDialog', [thingsboardDatakeyConfig])
+    .controller('DatakeyConfigDialogController', DatakeyConfigDialogController)
+    .name;
+
+/*@ngInject*/
+function DatakeyConfigDialogController($scope, $mdDialog, deviceService, dataKey, dataKeySettingsSchema, deviceAlias, deviceAliases) {
+
+    var vm = this;
+
+    vm.dataKey = dataKey;
+    vm.dataKeySettingsSchema = dataKeySettingsSchema;
+    vm.deviceAlias = deviceAlias;
+    vm.deviceAliases = deviceAliases;
+
+    vm.hide = function () {
+        $mdDialog.hide();
+    };
+
+    vm.cancel = function () {
+        $mdDialog.cancel();
+    };
+
+    vm.fetchDeviceKeys = function (deviceAliasId, query, type) {
+        var deviceId = vm.deviceAliases[deviceAliasId];
+        if (deviceId) {
+            return deviceService.getDeviceKeys(deviceId, query, type);
+        } else {
+            return [];
+        }
+    };
+
+    vm.save = function () {
+        $scope.$broadcast('form-submit');
+        if ($scope.theForm.$valid) {
+            $scope.theForm.$setPristine();
+            $mdDialog.hide(vm.dataKey);
+        }
+    };
+}
\ No newline at end of file

diff --git a/ui/src/app/components/datakey-config-dialog.tpl.html b/ui/src/app/components/datakey-config-dialog.tpl.html
new file mode 100644
index 0000000..89d04c5
--- /dev/null
+++ b/ui/src/app/components/datakey-config-dialog.tpl.html
@@ -0,0 +1,46 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-dialog aria-label="{{ 'datakey.configuration' | translate }}" style="width: 600px;">
+	<form name="theForm" ng-submit="vm.save()">
+		<md-toolbar>
+	      <div class="md-toolbar-tools">
+	        <h2 translate>datakey.configuration</h2>
+	        <span flex></span>
+	        <md-button class="md-icon-button" ng-click="vm.cancel()">
+	          <ng-md-icon icon="close" aria-label="{{ 'dialog.close' | translate }}"></ng-md-icon>
+	        </md-button>
+	      </div>
+	    </md-toolbar>
+   	    <md-progress-linear class="md-warn" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+  	    <span style="min-height: 5px;" flex="" ng-show="!loading"></span>	    
+	    <md-dialog-content>
+			<tb-datakey-config ng-model="vm.dataKey"
+                               fetch-device-keys="vm.fetchDeviceKeys(deviceAliasId, query, type)"
+                               device-alias="vm.deviceAlias"
+                               datakey-settings-schema="vm.dataKeySettingsSchema">
+			</tb-datakey-config>
+	    </md-dialog-content>
+	    <md-dialog-actions layout="row">
+	      <span flex></span>
+		  <md-button ng-disabled="loading || theForm.$invalid || !theForm.$dirty" type="submit" class="md-raised md-primary">
+		  		{{ 'action.save' | translate }}
+		  </md-button>
+	      <md-button ng-disabled="loading" ng-click="vm.cancel()" style="margin-right:20px;">{{ 'action.cancel' | translate }}</md-button>
+	    </md-dialog-actions>
+	</form>   
+</md-dialog>

diff --git a/ui/src/app/components/datasource.directive.js b/ui/src/app/components/datasource.directive.js
new file mode 100644
index 0000000..0a6fd2c
--- /dev/null
+++ b/ui/src/app/components/datasource.directive.js
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './datasource.scss';
+
+import thingsboardTypes from '../common/types.constant';
+import thingsboardDatasourceFunc from './datasource-func.directive'
+import thingsboardDatasourceDevice from './datasource-device.directive';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import datasourceTemplate from './datasource.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.datasource', [thingsboardTypes, thingsboardDatasourceFunc, thingsboardDatasourceDevice])
+    .directive('tbDatasource', Datasource)
+    .name;
+
+/*@ngInject*/
+function Datasource($compile, $templateCache, types) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+
+        var template = $templateCache.get(datasourceTemplate);
+        element.html(template);
+
+        scope.types = types;
+
+        if (scope.functionsOnly) {
+            scope.datasourceTypes = [types.datasourceType.function];
+        } else{
+            scope.datasourceTypes = [types.datasourceType.device, types.datasourceType.function];
+        }
+
+        scope.updateView = function () {
+            if (!scope.model.dataKeys) {
+                scope.model.dataKeys = [];
+            }
+            ngModelCtrl.$setViewValue(scope.model);
+        }
+
+        scope.$watch('model.type', function (newType, prevType) {
+            if (newType != prevType) {
+                scope.model.dataKeys = [];
+            }
+        });
+
+        scope.$watch('model', function () {
+            scope.updateView();
+        }, true);
+
+        ngModelCtrl.$render = function () {
+            scope.model = {};
+            if (ngModelCtrl.$viewValue) {
+                scope.model = ngModelCtrl.$viewValue;
+            }
+        };
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        scope: {
+            deviceAliases: '=',
+            widgetType: '=',
+            functionsOnly: '=',
+            datakeySettingsSchema: '=',
+            generateDataKey: '&',
+            fetchDeviceKeys: '&',
+            onCreateDeviceAlias: '&'
+        },
+        link: linker
+    };
+}

diff --git a/ui/src/app/components/datasource.scss b/ui/src/app/components/datasource.scss
new file mode 100644
index 0000000..0b22134
--- /dev/null
+++ b/ui/src/app/components/datasource.scss
@@ -0,0 +1,54 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.tb-datasource {
+   #device-autocomplete {
+     height: 30px;
+     margin-top: 18px;
+     md-autocomplete-wrap {
+       height: 30px;
+     }
+     input, input:not(.md-input) {
+       height: 30px;
+     }
+   }
+   #datasourceType {
+  }
+}
+
+@mixin tb-checkered-bg() {
+  background-color: #fff;
+  background-image: linear-gradient(45deg, #ddd 25%, transparent 25%, transparent 75%, #ddd 75%, #ddd),
+  linear-gradient(45deg, #ddd 25%, transparent 25%, transparent 75%, #ddd 75%, #ddd);
+  background-size: 8px 8px;
+  background-position: 0 0, 4px 4px;
+}
+
+.tb-color-preview {
+  content: '';
+  width: 24px;
+  height: 24px;
+  border: 2px solid #fff;
+  border-radius: 50%;
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .14), 0 2px 2px 0 rgba(0, 0, 0, .098), 0 1px 5px 0 rgba(0, 0, 0, .084);
+  position: relative;
+  overflow: hidden;
+  @include tb-checkered-bg();
+
+  .tb-color-result {
+    width: 100%;
+    height: 100%;
+  }
+}

diff --git a/ui/src/app/components/datasource.tpl.html b/ui/src/app/components/datasource.tpl.html
new file mode 100644
index 0000000..e698cc3
--- /dev/null
+++ b/ui/src/app/components/datasource.tpl.html
@@ -0,0 +1,46 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section flex layout='row' layout-align="start center" class="tb-datasource">
+    <md-input-container style="min-width: 110px;">
+        <md-select placeholder="{{ 'datasource.type' | translate }}" required id="datasourceType" ng-model="model.type">
+            <md-option ng-repeat="datasourceType in datasourceTypes" value="{{datasourceType}}">
+                {{ datasourceType | translate }}
+            </md-option>
+        </md-select>
+    </md-input-container>
+    <section flex layout='row' layout-align="start center" class="datasource" ng-switch on="model.type">
+        <tb-datasource-func flex style="padding-left: 8px;"
+                            ng-switch-default
+                            ng-model="model"
+                            datakey-settings-schema="datakeySettingsSchema"
+                            ng-required="model.type === types.datasourceType.function"
+                            generate-data-key="generateDataKey({chip: chip, type: type})">
+        </tb-datasource-func>
+        <tb-datasource-device flex style="padding-left: 4px; padding-right: 4px;"
+                              ng-model="model"
+                              datakey-settings-schema="datakeySettingsSchema"
+                              ng-switch-when="device"
+                              ng-required="model.type === types.datasourceType.device"
+                              widget-type="widgetType"
+                              device-aliases="deviceAliases"
+                              generate-data-key="generateDataKey({chip: chip, type: type})"
+                              fetch-device-keys="fetchDeviceKeys({deviceAliasId: deviceAliasId, query: query, type: type})"
+                              on-create-device-alias="onCreateDeviceAlias({event: event, alias: alias})">
+        </tb-datasource-device>
+    </section>
+</section>

diff --git a/ui/src/app/components/datasource-device.directive.js b/ui/src/app/components/datasource-device.directive.js
new file mode 100644
index 0000000..889a886
--- /dev/null
+++ b/ui/src/app/components/datasource-device.directive.js
@@ -0,0 +1,248 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './datasource-device.scss';
+
+import 'md-color-picker';
+import tinycolor from 'tinycolor2';
+import $ from 'jquery';
+import thingsboardTypes from '../common/types.constant';
+import thingsboardDatakeyConfigDialog from './datakey-config-dialog.controller';
+import thingsboardTruncate from './truncate.filter';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import datasourceDeviceTemplate from './datasource-device.tpl.html';
+import datakeyConfigDialogTemplate from './datakey-config-dialog.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/* eslint-disable angular/angularelement */
+
+export default angular.module('thingsboard.directives.datasourceDevice', [thingsboardTruncate, thingsboardTypes, thingsboardDatakeyConfigDialog])
+    .directive('tbDatasourceDevice', DatasourceDevice)
+    .name;
+
+/*@ngInject*/
+function DatasourceDevice($compile, $templateCache, $q, $mdDialog, $window, $document, $mdColorPicker, $mdConstant, types) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var template = $templateCache.get(datasourceDeviceTemplate);
+        element.html(template);
+
+        scope.ngModelCtrl = ngModelCtrl;
+        scope.types = types;
+
+        scope.selectedTimeseriesDataKey = null;
+        scope.timeseriesDataKeySearchText = null;
+
+        scope.selectedAttributeDataKey = null;
+        scope.attributeDataKeySearchText = null;
+
+        scope.updateValidity = function () {
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                var dataValid = angular.isDefined(value) && value != null;
+                ngModelCtrl.$setValidity('deviceData', dataValid);
+                if (dataValid) {
+                    ngModelCtrl.$setValidity('deviceAlias',
+                        angular.isDefined(value.deviceAliasId) &&
+                        value.deviceAliasId != null);
+                    ngModelCtrl.$setValidity('deviceKeys',
+                        angular.isDefined(value.dataKeys) &&
+                        value.dataKeys != null &&
+                        value.dataKeys.length > 0);
+                }
+            }
+        };
+
+        scope.$watch('deviceAlias', function () {
+            if (ngModelCtrl.$viewValue) {
+                if (scope.deviceAlias) {
+                    ngModelCtrl.$viewValue.deviceAliasId = scope.deviceAlias.id;
+                } else {
+                    ngModelCtrl.$viewValue.deviceAliasId = null;
+                }
+                scope.updateValidity();
+                scope.selectedDeviceAliasChange();
+            }
+        });
+
+        scope.$watch('timeseriesDataKeys', function () {
+            if (ngModelCtrl.$viewValue) {
+                var dataKeys = [];
+                dataKeys = dataKeys.concat(scope.timeseriesDataKeys);
+                dataKeys = dataKeys.concat(scope.attributeDataKeys);
+                ngModelCtrl.$viewValue.dataKeys = dataKeys;
+                scope.updateValidity();
+            }
+        }, true);
+
+        scope.$watch('attributeDataKeys', function () {
+            if (ngModelCtrl.$viewValue) {
+                var dataKeys = [];
+                dataKeys = dataKeys.concat(scope.timeseriesDataKeys);
+                dataKeys = dataKeys.concat(scope.attributeDataKeys);
+                ngModelCtrl.$viewValue.dataKeys = dataKeys;
+                scope.updateValidity();
+            }
+        }, true);
+
+        ngModelCtrl.$render = function () {
+            if (ngModelCtrl.$viewValue) {
+                var deviceAliasId = ngModelCtrl.$viewValue.deviceAliasId;
+                if (scope.deviceAliases[deviceAliasId]) {
+                    scope.deviceAlias = {id: deviceAliasId, alias: scope.deviceAliases[deviceAliasId].alias,
+                        deviceId: scope.deviceAliases[deviceAliasId].deviceId};
+                } else {
+                    scope.deviceAlias = null;
+                }
+                var timeseriesDataKeys = [];
+                var attributeDataKeys = [];
+                for (var d in ngModelCtrl.$viewValue.dataKeys) {
+                    var dataKey = ngModelCtrl.$viewValue.dataKeys[d];
+                    if (dataKey.type === types.dataKeyType.timeseries) {
+                        timeseriesDataKeys.push(dataKey);
+                    } else if (dataKey.type === types.dataKeyType.attribute) {
+                        attributeDataKeys.push(dataKey);
+                    }
+                }
+                scope.timeseriesDataKeys = timeseriesDataKeys;
+                scope.attributeDataKeys = attributeDataKeys;
+            }
+        };
+
+        scope.textIsNotEmpty = function(text) {
+            return (text && text != null && text.length > 0) ? true : false;
+        }
+
+        scope.selectedDeviceAliasChange = function () {
+            if (!scope.timeseriesDataKeySearchText || scope.timeseriesDataKeySearchText === '') {
+                scope.timeseriesDataKeySearchText = scope.timeseriesDataKeySearchText === '' ? null : '';
+            }
+            if (!scope.attributeDataKeySearchText || scope.attributeDataKeySearchText === '') {
+                scope.attributeDataKeySearchText = scope.attributeDataKeySearchText === '' ? null : '';
+            }
+        };
+
+        scope.transformTimeseriesDataKeyChip = function (chip) {
+            return scope.generateDataKey({chip: chip, type: types.dataKeyType.timeseries});
+        };
+
+        scope.transformAttributeDataKeyChip = function (chip) {
+            return scope.generateDataKey({chip: chip, type: types.dataKeyType.attribute});
+        };
+
+        scope.showColorPicker = function (event, dataKey) {
+            $mdColorPicker.show({
+                value: dataKey.color,
+                defaultValue: '#fff',
+                random: tinycolor.random(),
+                clickOutsideToClose: false,
+                hasBackdrop: false,
+                skipHide: true,
+                preserveScope: false,
+
+                mdColorAlphaChannel: true,
+                mdColorSpectrum: true,
+                mdColorSliders: true,
+                mdColorGenericPalette: false,
+                mdColorMaterialPalette: true,
+                mdColorHistory: false,
+                mdColorDefaultTab: 2,
+
+                $event: event
+
+            }).then(function (color) {
+                dataKey.color = color;
+                ngModelCtrl.$setDirty();
+            });
+        }
+
+        scope.editDataKey = function (event, dataKey, index) {
+
+            $mdDialog.show({
+                controller: 'DatakeyConfigDialogController',
+                controllerAs: 'vm',
+                templateUrl: datakeyConfigDialogTemplate,
+                locals: {
+                    dataKey: angular.copy(dataKey),
+                    dataKeySettingsSchema: scope.datakeySettingsSchema,
+                    deviceAlias: scope.deviceAlias,
+                    deviceAliases: scope.deviceAliases
+                },
+                parent: angular.element($document[0].body),
+                fullscreen: true,
+                targetEvent: event,
+                skipHide: true,
+                onComplete: function () {
+                    var w = angular.element($window);
+                    w.triggerHandler('resize');
+                }
+            }).then(function (dataKey) {
+                if (dataKey.type === types.dataKeyType.timeseries) {
+                    scope.timeseriesDataKeys[index] = dataKey;
+                } else if (dataKey.type === types.dataKeyType.attribute) {
+                    scope.attributeDataKeys[index] = dataKey;
+                }
+                ngModelCtrl.$setDirty();
+            }, function () {
+            });
+        };
+
+        scope.dataKeysSearch = function (searchText, type) {
+            if (scope.deviceAlias) {
+                var deferred = $q.defer();
+                scope.fetchDeviceKeys({deviceAliasId: scope.deviceAlias.id, query: searchText, type: type})
+                    .then(function (dataKeys) {
+                        deferred.resolve(dataKeys);
+                    }, function (e) {
+                        deferred.reject(e);
+                    });
+                return deferred.promise;
+            } else {
+                return $q.when([]);
+            }
+        };
+
+        scope.createKey = function (event, chipsId) {
+            var chipsChild = $(chipsId, element)[0].firstElementChild;
+            var el = angular.element(chipsChild);
+            var chipBuffer = el.scope().$mdChipsCtrl.getChipBuffer();
+            event.preventDefault();
+            event.stopPropagation();
+            el.scope().$mdChipsCtrl.appendChip(chipBuffer.trim());
+            el.scope().$mdChipsCtrl.resetChipBuffer();
+        }
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        scope: {
+            widgetType: '=',
+            deviceAliases: '=',
+            datakeySettingsSchema: '=',
+            generateDataKey: '&',
+            fetchDeviceKeys: '&',
+            onCreateDeviceAlias: '&'
+        },
+        link: linker
+    };
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/datasource-device.scss b/ui/src/app/components/datasource-device.scss
new file mode 100644
index 0000000..5e01d1f
--- /dev/null
+++ b/ui/src/app/components/datasource-device.scss
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.tb-device-alias-autocomplete, .tb-timeseries-datakey-autocomplete, .tb-attribute-datakey-autocomplete {
+  .tb-not-found {
+    display: block;
+    line-height: 1.5;
+    height: 48px;
+    .tb-no-entries {
+      line-height: 48px;
+    }
+  }
+  li {
+    height: auto !important;
+    white-space: normal !important;
+  }
+}

diff --git a/ui/src/app/components/datasource-device.tpl.html b/ui/src/app/components/datasource-device.tpl.html
new file mode 100644
index 0000000..c9f4b10
--- /dev/null
+++ b/ui/src/app/components/datasource-device.tpl.html
@@ -0,0 +1,127 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section flex layout='row' layout-align="start center">
+	   <tb-device-alias-select flex="40"
+							  tb-required="true"
+							  device-aliases="deviceAliases"
+							  ng-model="deviceAlias"
+							  on-create-device-alias="onCreateDeviceAlias({event: event, alias: alias})">
+	   </tb-device-alias-select>
+	   <section flex="120" layout='column'>
+		   <section flex layout='row' layout-align="start center">
+			   <md-chips flex style="padding-left: 4px;"
+						 id="timeseries_datakey_chips"
+						 ng-required="true"
+						 ng-model="timeseriesDataKeys" md-autocomplete-snap
+						 md-transform-chip="transformTimeseriesDataKeyChip($chip)"
+						 md-require-match="false">
+					  <md-autocomplete
+							md-no-cache="true"
+							id="timeseries_datakey"
+							md-selected-item="selectedTimeseriesDataKey"
+							md-search-text="timeseriesDataKeySearchText"
+							md-items="item in dataKeysSearch(timeseriesDataKeySearchText, types.dataKeyType.timeseries)"
+							md-item-text="item.name"
+							md-min-length="0"
+							placeholder="{{'datakey.timeseries' | translate }}"
+							md-menu-class="tb-timeseries-datakey-autocomplete">
+							<span md-highlight-text="timeseriesDataKeySearchText" md-highlight-flags="^i">{{item}}</span>
+							<md-not-found>
+							  <div class="tb-not-found">
+								  <div class="tb-no-entries" ng-if="!textIsNotEmpty(timeseriesDataKeySearchText)">
+									  <span translate>device.no-keys-found</span>
+								  </div>
+								  <div ng-if="textIsNotEmpty(timeseriesDataKeySearchText)">
+									  <span translate translate-values='{ key: "{{timeseriesDataKeySearchText | truncate:true:6:&apos;...&apos;}}" }'>device.no-key-matching</span>
+									  <span>
+											<a translate ng-click="createKey($event, '#timeseries_datakey_chips')">device.create-new-key</a>
+									  </span>
+								  </div>
+							  </div>
+							</md-not-found>
+					  </md-autocomplete>
+					  <md-chip-template>
+						<div layout="row" layout-align="start center">
+							<div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
+								<div class="tb-color-result" ng-style="{background: $chip.color}"></div>
+							</div>
+							<div>
+							  {{$chip.label}}:
+							  <strong ng-if="!$chip.postFuncBody">{{$chip.name}}</strong>
+							  <strong ng-if="$chip.postFuncBody">f({{$chip.name}})</strong>
+							</div>
+							<md-button ng-click="editDataKey($event, $chip, $index)" class="md-icon-button tb-md-32">
+								<md-icon aria-label="edit" class="material-icons tb-md-20">edit</md-icon>
+							</md-button>
+						</div>
+					  </md-chip-template>
+			   </md-chips>
+			   <md-chips flex ng-if="widgetType === types.widgetType.latest.value" style="padding-left: 4px;"
+                         id="attribute_datakey_chips"
+                         ng-required="true"
+                         ng-model="attributeDataKeys" md-autocomplete-snap
+                         md-transform-chip="transformAttributeDataKeyChip($chip)"
+                         md-require-match="false">
+					  <md-autocomplete
+							md-no-cache="true"
+							id="attribute_datakey"
+							md-selected-item="selectedAttributeDataKey"
+							md-search-text="attributeDataKeySearchText"
+							md-items="item in dataKeysSearch(attributeDataKeySearchText, types.dataKeyType.attribute)"
+							md-item-text="item.name"
+							md-min-length="0"
+							placeholder="{{'datakey.attributes' | translate }}"
+							md-menu-class="tb-attribute-datakey-autocomplete">
+							<span md-highlight-text="attributeDataKeySearchText" md-highlight-flags="^i">{{item}}</span>
+						    <md-not-found>
+							  <div class="tb-not-found">
+								  <div class="tb-no-entries" ng-if="!textIsNotEmpty(attributeDataKeySearchText)">
+									  <span translate>device.no-keys-found</span>
+								  </div>
+								  <div ng-if="textIsNotEmpty(attributeDataKeySearchText)">
+									  <span translate translate-values='{ key: "{{attributeDataKeySearchText | truncate:true:6:&apos;...&apos;}}" }'>device.no-key-matching</span>
+									  <span>
+											<a translate ng-click="createKey($event, '#attribute_datakey_chips')">device.create-new-key</a>
+									  </span>
+								  </div>
+							  </div>
+						    </md-not-found>
+					  </md-autocomplete>
+					  <md-chip-template>
+						<div layout="row" layout-align="start center">
+							<div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
+								<div class="tb-color-result" ng-style="{background: $chip.color}"></div>
+							</div>
+							<div>
+							  {{$chip.label}}:
+							  <strong ng-if="!$chip.postFuncBody">{{$chip.name}}</strong>
+							  <strong ng-if="$chip.postFuncBody">f({{$chip.name}})</strong>
+							</div>
+							<md-button ng-click="editDataKey($event, $chip, $index)" class="md-icon-button tb-md-32">
+								<md-icon aria-label="edit" class="material-icons tb-md-20">edit</md-icon>
+							</md-button>
+						</div>
+					  </md-chip-template>
+			   </md-chips>
+		   </section>
+		   <div class="tb-error-messages" ng-messages="ngModelCtrl.$error" role="alert">
+			    <div translate ng-message="deviceKeys" ng-if="widgetType === types.widgetType.timeseries.value" class="tb-error-message">datakey.timeseries-required</div>
+				<div translate ng-message="deviceKeys" ng-if="widgetType === types.widgetType.latest.value" class="tb-error-message">datakey.timeseries-or-attributes-required</div>
+			</div>
+	   </section>
+</section>

diff --git a/ui/src/app/components/datasource-func.directive.js b/ui/src/app/components/datasource-func.directive.js
new file mode 100644
index 0000000..37f48d3
--- /dev/null
+++ b/ui/src/app/components/datasource-func.directive.js
@@ -0,0 +1,182 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './datasource-func.scss';
+
+import 'md-color-picker';
+import tinycolor from 'tinycolor2';
+import $ from 'jquery';
+import thingsboardTypes from '../common/types.constant';
+import thingsboardUtils from '../common/utils.service';
+import thingsboardDatakeyConfigDialog from './datakey-config-dialog.controller';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import datasourceFuncTemplate from './datasource-func.tpl.html';
+import datakeyConfigDialogTemplate from './datakey-config-dialog.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/* eslint-disable angular/angularelement */
+
+export default angular.module('thingsboard.directives.datasourceFunc', [thingsboardTypes, thingsboardUtils, thingsboardDatakeyConfigDialog])
+    .directive('tbDatasourceFunc', DatasourceFunc)
+    .name;
+
+/*@ngInject*/
+function DatasourceFunc($compile, $templateCache, $mdDialog, $window, $document, $mdColorPicker, types, utils) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var template = $templateCache.get(datasourceFuncTemplate);
+        element.html(template);
+
+        scope.ngModelCtrl = ngModelCtrl;
+        scope.functionTypes = utils.getPredefinedFunctionsList();
+
+        scope.selectedDataKey = null;
+        scope.dataKeySearchText = null;
+
+        scope.updateValidity = function () {
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                var dataValid = angular.isDefined(value) && value != null;
+                ngModelCtrl.$setValidity('deviceData', dataValid);
+                if (dataValid) {
+                    ngModelCtrl.$setValidity('funcTypes',
+                        angular.isDefined(value.dataKeys) &&
+                        value.dataKeys != null &&
+                        value.dataKeys.length > 0);
+                }
+            }
+        };
+
+        scope.$watch('funcDataKeys', function () {
+            if (ngModelCtrl.$viewValue) {
+                var dataKeys = [];
+                dataKeys = dataKeys.concat(scope.funcDataKeys);
+                ngModelCtrl.$viewValue.dataKeys = dataKeys;
+                scope.updateValidity();
+            }
+        }, true);
+
+        ngModelCtrl.$render = function () {
+            if (ngModelCtrl.$viewValue) {
+                var funcDataKeys = [];
+                if (ngModelCtrl.$viewValue.dataKeys) {
+                    funcDataKeys = funcDataKeys.concat(ngModelCtrl.$viewValue.dataKeys);
+                }
+                scope.funcDataKeys = funcDataKeys;
+            }
+        };
+
+        scope.transformDataKeyChip = function (chip) {
+            return scope.generateDataKey({chip: chip, type: types.dataKeyType.function});
+        };
+
+        scope.showColorPicker = function (event, dataKey) {
+            $mdColorPicker.show({
+                value: dataKey.color,
+                defaultValue: '#fff',
+                random: tinycolor.random(),
+                clickOutsideToClose: false,
+                hasBackdrop: false,
+                skipHide: true,
+                preserveScope: false,
+
+                mdColorAlphaChannel: true,
+                mdColorSpectrum: true,
+                mdColorSliders: true,
+                mdColorGenericPalette: false,
+                mdColorMaterialPalette: true,
+                mdColorHistory: false,
+                mdColorDefaultTab: 2,
+
+                $event: event
+
+            }).then(function (color) {
+                dataKey.color = color;
+                ngModelCtrl.$setDirty();
+            });
+        }
+
+        scope.editDataKey = function (event, dataKey, index) {
+
+            $mdDialog.show({
+                controller: 'DatakeyConfigDialogController',
+                controllerAs: 'vm',
+                templateUrl: datakeyConfigDialogTemplate,
+                locals: {
+                    dataKey: angular.copy(dataKey),
+                    dataKeySettingsSchema: scope.datakeySettingsSchema,
+                    deviceAlias: null,
+                    deviceAliases: null
+                },
+                parent: angular.element($document[0].body),
+                fullscreen: true,
+                targetEvent: event,
+                skipHide: true,
+                onComplete: function () {
+                    var w = angular.element($window);
+                    w.triggerHandler('resize');
+                }
+            }).then(function (dataKey) {
+                scope.funcDataKeys[index] = dataKey;
+                ngModelCtrl.$setDirty();
+            }, function () {
+            });
+        };
+
+        scope.textIsNotEmpty = function(text) {
+            return (text && text != null && text.length > 0) ? true : false;
+        }
+
+        scope.dataKeysSearch = function (dataKeySearchText) {
+            var dataKeys = dataKeySearchText ? scope.functionTypes.filter(
+                scope.createFilterForDataKey(dataKeySearchText)) : scope.functionTypes;
+            return dataKeys;
+        };
+
+        scope.createFilterForDataKey = function (query) {
+            var lowercaseQuery = angular.lowercase(query);
+            return function filterFn(dataKey) {
+                return (angular.lowercase(dataKey).indexOf(lowercaseQuery) === 0);
+            };
+        };
+
+        scope.createKey = function (event, chipsId) {
+            var chipsChild = $(chipsId, element)[0].firstElementChild;
+            var el = angular.element(chipsChild);
+            var chipBuffer = el.scope().$mdChipsCtrl.getChipBuffer();
+            event.preventDefault();
+            event.stopPropagation();
+            el.scope().$mdChipsCtrl.appendChip(chipBuffer.trim());
+            el.scope().$mdChipsCtrl.resetChipBuffer();
+        }
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        scope: {
+            generateDataKey: '&',
+            datakeySettingsSchema: '='
+        },
+        link: linker
+    };
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/datasource-func.scss b/ui/src/app/components/datasource-func.scss
new file mode 100644
index 0000000..08dbd4e
--- /dev/null
+++ b/ui/src/app/components/datasource-func.scss
@@ -0,0 +1,29 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.tb-func-datakey-autocomplete {
+  .tb-not-found {
+    display: block;
+    line-height: 1.5;
+    height: 48px;
+    .tb-no-entries {
+      line-height: 48px;
+    }
+  }
+  li {
+    height: auto !important;
+    white-space: normal !important;
+  }
+}

diff --git a/ui/src/app/components/datasource-func.tpl.html b/ui/src/app/components/datasource-func.tpl.html
new file mode 100644
index 0000000..2b509f5
--- /dev/null
+++ b/ui/src/app/components/datasource-func.tpl.html
@@ -0,0 +1,68 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section flex layout='column'>
+   <md-chips flex style="padding-left: 4px;"
+			     id="function_datakey_chips"
+	   			 ng-required="true"
+	             ng-model="funcDataKeys" md-autocomplete-snap
+	             md-transform-chip="transformDataKeyChip($chip)"
+	             md-require-match="false">    
+		      <md-autocomplete 
+		    		md-no-cache="false"
+		    		id="dataKey"
+					md-selected-item="selectedDataKey"
+					md-search-text="dataKeySearchText"
+					md-items="item in dataKeysSearch(dataKeySearchText)"
+					md-item-text="item.name"
+					md-min-length="0"
+		            placeholder="{{ 'datakey.function-types' | translate }}"
+					md-menu-class="tb-func-datakey-autocomplete">
+		            <span md-highlight-text="dataKeySearchText" md-highlight-flags="^i">{{item}}</span>
+				    <md-not-found>
+						<div class="tb-not-found">
+							<div class="tb-no-entries" ng-if="!textIsNotEmpty(dataKeySearchText)">
+								<span translate>device.no-keys-found</span>
+							</div>
+							<div ng-if="textIsNotEmpty(dataKeySearchText)">
+								<span translate translate-values='{ key: "{{dataKeySearchText | truncate:true:6:&apos;...&apos;}}" }'>device.no-key-matching</span>
+								<span>
+		          					<a translate ng-click="createKey($event, '#function_datakey_chips')">device.create-new-key</a>
+						  		</span>
+							</div>
+						</div>
+				    </md-not-found>
+			  </md-autocomplete>
+		      <md-chip-template>
+		      	<div layout="row" layout-align="start center">
+					<div class="tb-color-preview" ng-click="showColorPicker($event, $chip, $index)" style="margin-right: 5px;">
+						<div class="tb-color-result" ng-style="{background: $chip.color}"></div>
+					</div>
+			        <div>
+			          {{$chip.label}}: 
+			          <strong>{{$chip.name}}</strong>
+			        </div>
+				    <md-button ng-click="editDataKey($event, $chip, $index)" class="md-icon-button tb-md-32">
+		        		<md-icon aria-label="edit" class="material-icons tb-md-20">edit</md-icon>
+		      		</md-button>
+		      	</div>
+		      </md-chip-template>
+	</md-chips>
+	<div class="tb-error-messages" ng-messages="ngModelCtrl.$error" role="alert">
+		<div translate ng-message="funcTypes" class="tb-error-message">datakey.function-types-required</div>
+	</div>
+</section>

diff --git a/ui/src/app/components/datetime-period.directive.js b/ui/src/app/components/datetime-period.directive.js
new file mode 100644
index 0000000..00c6cf0
--- /dev/null
+++ b/ui/src/app/components/datetime-period.directive.js
@@ -0,0 +1,108 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './datetime-period.scss';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import datetimePeriodTemplate from './datetime-period.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.datetimePeriod', [])
+    .directive('tbDatetimePeriod', DatetimePeriod)
+    .name;
+
+/*@ngInject*/
+function DatetimePeriod($compile, $templateCache) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+
+        var template = $templateCache.get(datetimePeriodTemplate);
+        element.html(template);
+
+        ngModelCtrl.$render = function () {
+            var date = new Date();
+            scope.startDate = new Date(
+                date.getFullYear(),
+                date.getMonth(),
+                date.getDate() - 1);
+            scope.endDate = date;
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                scope.startDate = new Date(value.startTimeMs);
+                scope.endDate = new Date(value.endTimeMs);
+            }
+        }
+
+        scope.updateMinMaxDates = function () {
+            scope.maxStartDate = angular.copy(new Date(scope.endDate.getTime() - 1000));
+            scope.minEndDate = angular.copy(new Date(scope.startDate.getTime() + 1000));
+            scope.maxEndDate = new Date();
+        }
+
+        scope.updateView = function () {
+            var value = null;
+            if (scope.startDate && scope.endDate) {
+                value = {
+                    startTimeMs: scope.startDate.getTime(),
+                    endTimeMs: scope.endDate.getTime()
+                };
+                ngModelCtrl.$setValidity('datetimePeriod', true);
+            } else {
+                ngModelCtrl.$setValidity('datetimePeriod', !scope.required);
+            }
+            ngModelCtrl.$setViewValue(value);
+        }
+
+        scope.$watch('required', function () {
+            scope.updateView();
+        });
+
+        scope.$watch('startDate', function (newDate) {
+            if (newDate) {
+                if (newDate.getTime() > scope.maxStartDate) {
+                    scope.startDate = angular.copy(scope.maxStartDate);
+                }
+                scope.updateMinMaxDates();
+            }
+            scope.updateView();
+        });
+
+        scope.$watch('endDate', function (newDate) {
+            if (newDate) {
+                if (newDate.getTime() < scope.minEndDate) {
+                    scope.endDate = angular.copy(scope.minEndDate);
+                } else if (newDate.getTime() > scope.maxEndDate) {
+                    scope.endDate = angular.copy(scope.maxEndDate);
+                }
+                scope.updateMinMaxDates();
+            }
+            scope.updateView();
+        });
+
+        $compile(element.contents())(scope);
+
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        scope: {
+            required: '=ngRequired'
+        },
+        link: linker
+    };
+}

diff --git a/ui/src/app/components/datetime-period.scss b/ui/src/app/components/datetime-period.scss
new file mode 100644
index 0000000..e4b3b45
--- /dev/null
+++ b/ui/src/app/components/datetime-period.scss
@@ -0,0 +1,28 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+tb-datetime-period {
+  md-input-container {
+    margin-bottom: 0px;
+    .md-errors-spacer {
+      min-height: 0px;
+    }
+  }
+  mdp-date-picker {
+    .md-input {
+      width: 150px !important;
+    }
+  }
+}

diff --git a/ui/src/app/components/datetime-period.tpl.html b/ui/src/app/components/datetime-period.tpl.html
new file mode 100644
index 0000000..39938d4
--- /dev/null
+++ b/ui/src/app/components/datetime-period.tpl.html
@@ -0,0 +1,31 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section layout="column" layout-align="start start">
+	<section layout="row" layout-align="start start">
+	    <mdp-date-picker ng-model="startDate" mdp-placeholder="{{ 'datetime.date-from' | translate }}"
+	       	mdp-max-date="maxStartDate"></mdp-date-picker>
+	    <mdp-time-picker ng-model="startDate" mdp-placeholder="{{ 'datetime.time-from' | translate }}"
+	    	mdp-max-date="maxStartDate" mdp-auto-switch="true"></mdp-time-picker>   	
+    </section>
+	<section layout="row" layout-align="start start">
+	    <mdp-date-picker ng-model="endDate" mdp-placeholder="{{ 'datetime.date-to' | translate }}"
+	       	mdp-min-date="minEndDate" mdp-max-date="maxEndDate"></mdp-date-picker>
+	    <mdp-time-picker ng-model="endDate" mdp-placeholder="{{ 'datetime.time-to' | translate }}"
+	    	mdp-min-date="minEndDate" mdp-max-date="maxEndDate" mdp-auto-switch="true"></mdp-time-picker>   	
+    </section>
+</section>
\ No newline at end of file

diff --git a/ui/src/app/components/details-sidenav.directive.js b/ui/src/app/components/details-sidenav.directive.js
new file mode 100644
index 0000000..71beab7
--- /dev/null
+++ b/ui/src/app/components/details-sidenav.directive.js
@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './details-sidenav.scss';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import detailsSidenavTemplate from './details-sidenav.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.detailsSidenav', [])
+    .directive('tbDetailsSidenav', DetailsSidenav)
+    .name;
+
+/*@ngInject*/
+function DetailsSidenav($timeout) {
+
+    var linker = function (scope, element, attrs) {
+
+        if (angular.isUndefined(attrs.isReadOnly)) {
+            attrs.isReadOnly = false;
+        }
+
+        if (angular.isUndefined(scope.headerHeightPx)) {
+            scope.headerHeightPx = 100;
+        }
+
+        if (angular.isDefined(attrs.isAlwaysEdit) && attrs.isAlwaysEdit) {
+            scope.isEdit = true;
+        }
+
+        scope.toggleDetailsEditMode = function () {
+            if (!scope.isAlwaysEdit) {
+                if (!scope.isEdit) {
+                    scope.isEdit = true;
+                } else {
+                    scope.isEdit = false;
+                }
+            }
+            $timeout(function () {
+                scope.onToggleDetailsEditMode();
+            });
+        };
+
+        scope.detailsApply = function () {
+            $timeout(function () {
+                scope.onApplyDetails();
+            });
+        }
+
+        scope.closeDetails = function () {
+            scope.isOpen = false;
+            $timeout(function () {
+                scope.onCloseDetails();
+            });
+        };
+    }
+
+    return {
+        restrict: "E",
+        transclude: {
+            headerPane: '?headerPane',
+            detailsButtons: '?detailsButtons'
+        },
+        scope: {
+            headerTitle: '=',
+            headerSubtitle: '@',
+            headerHeightPx: '@',
+            isReadOnly: '=',
+            isOpen: '=',
+            isEdit: '=?',
+            isAlwaysEdit: '=?',
+            theForm: '=',
+            onCloseDetails: '&',
+            onToggleDetailsEditMode: '&',
+            onApplyDetails: '&'
+        },
+        link: linker,
+        templateUrl: detailsSidenavTemplate
+    };
+}
\ No newline at end of file

diff --git a/ui/src/app/components/details-sidenav.scss b/ui/src/app/components/details-sidenav.scss
new file mode 100644
index 0000000..2dc2b51
--- /dev/null
+++ b/ui/src/app/components/details-sidenav.scss
@@ -0,0 +1,49 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import '../../scss/constants';
+
+.tb-details-title {
+  font-size: 1.600rem;
+  font-weight: 400;
+  text-transform: uppercase;
+  margin: 20px 8px 0 0;
+}
+
+.tb-details-subtitle {
+  font-size: 1.000rem;
+  margin: 10px 0;
+  opacity: 0.8;
+}
+
+md-sidenav.tb-sidenav-details {
+  width: 100% !important;
+  max-width: 100% !important;
+  z-index: 59 !important;
+  @media (min-width: $layout-breakpoint-gt-sm) {
+    width: 80% !important;
+  }
+  @media (min-width: $layout-breakpoint-gt-md) {
+    width: 65% !important;
+  }
+  @media (min-width: $layout-breakpoint-lg) {
+    width: 45% !important;
+  }
+  tb-dashboard {
+    md-content {
+      background-color: $primary-hue-3;
+    }
+  }
+}

diff --git a/ui/src/app/components/details-sidenav.tpl.html b/ui/src/app/components/details-sidenav.tpl.html
new file mode 100644
index 0000000..a5e84e0
--- /dev/null
+++ b/ui/src/app/components/details-sidenav.tpl.html
@@ -0,0 +1,62 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-sidenav class="md-sidenav-right md-whiteframe-4dp tb-sidenav-details"
+      md-disable-backdrop="true"
+      md-is-open="isOpen"
+      md-component-id="right"
+      layout="column">
+      <header>
+	      <md-toolbar class="md-theme-light" ng-style="{'height':headerHeightPx+'px'}">
+	      	<div class="md-toolbar-tools">
+	      		<div class="md-toolbar-tools" layout="column" layout-align="start start">
+		        	<span class="tb-details-title">{{headerTitle}}</span>
+		        	<span class="tb-details-subtitle">{{headerSubtitle}}</span>
+					<span style="width: 100%;" ng-transclude="headerPane"></span>
+	        	</div>
+	        	<span flex></span>
+				<div ng-transclude="detailsButtons"></div>
+	        	<md-button class="md-icon-button" ng-click="closeDetails()">
+	        		<md-icon aria-label="close" class="material-icons">close</md-icon>
+	        	</md-button>	        	
+	        </div>
+		    <section ng-if="!isReadOnly" layout="row" layout-wrap
+				   class="tb-header-buttons md-fab">
+				<md-button ng-show="isEdit" ng-disabled="loading || theForm.$invalid || !theForm.$dirty"
+							 class="tb-btn-header md-accent md-hue-2 md-fab md-fab-bottom-right"
+							 aria-label="{{ 'action.apply' | translate }}"
+							 ng-click="detailsApply()">
+					  <md-tooltip md-direction="top">
+						  {{ 'action.apply-changes' | translate }}
+					  </md-tooltip>
+					  <ng-md-icon icon="done"></ng-md-icon>
+				</md-button>
+				<md-button ng-disabled="loading || (isAlwaysEdit && !theForm.$dirty)" class="tb-btn-header md-accent md-hue-2 md-fab md-fab-bottom-right"
+					 aria-label="{{ 'details.edit-mode' | translate }}"
+					 ng-click="toggleDetailsEditMode()">
+					<md-tooltip md-direction="top">
+						{{ (isAlwaysEdit ? 'action.decline-changes' : 'details.toggle-edit-mode') | translate }}
+					</md-tooltip>
+					<ng-md-icon icon="{{isEdit ? 'close' : 'edit'}}" options='{"easing": "circ-in-out", "duration": 375, "rotation": "none"}'></ng-md-icon>
+				</md-button>
+			</section>
+	      </md-toolbar>
+      </header>
+      <md-content flex>
+			<div ng-transclude></div>
+      </md-content>
+</md-sidenav>	
\ No newline at end of file

diff --git a/ui/src/app/components/device-alias-select.directive.js b/ui/src/app/components/device-alias-select.directive.js
new file mode 100644
index 0000000..52a31cc
--- /dev/null
+++ b/ui/src/app/components/device-alias-select.directive.js
@@ -0,0 +1,145 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import $ from 'jquery';
+
+import './device-alias-select.scss';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import deviceAliasSelectTemplate from './device-alias-select.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+
+/* eslint-disable angular/angularelement */
+
+export default angular.module('thingsboard.directives.deviceAliasSelect', [])
+    .directive('tbDeviceAliasSelect', DeviceAliasSelect)
+    .name;
+
+/*@ngInject*/
+function DeviceAliasSelect($compile, $templateCache, $mdConstant) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var template = $templateCache.get(deviceAliasSelectTemplate);
+        element.html(template);
+
+        scope.tbRequired = angular.isDefined(scope.tbRequired) ? scope.tbRequired : false;
+
+        scope.ngModelCtrl = ngModelCtrl;
+        scope.deviceAliasList = [];
+        scope.deviceAlias = null;
+
+        scope.updateValidity = function () {
+            var value = ngModelCtrl.$viewValue;
+            var valid = angular.isDefined(value) && value != null || !scope.tbRequired;
+            ngModelCtrl.$setValidity('deviceAlias', valid);
+        };
+
+        scope.$watch('deviceAliases', function () {
+            scope.deviceAliasList = [];
+            for (var aliasId in scope.deviceAliases) {
+                var deviceAlias = {id: aliasId, alias: scope.deviceAliases[aliasId].alias, deviceId: scope.deviceAliases[aliasId].deviceId};
+                scope.deviceAliasList.push(deviceAlias);
+            }
+        }, true);
+
+        scope.$watch('deviceAlias', function () {
+            scope.updateView();
+        });
+
+        scope.deviceAliasSearch = function (deviceAliasSearchText) {
+            return deviceAliasSearchText ? scope.deviceAliasList.filter(
+                scope.createFilterForDeviceAlias(deviceAliasSearchText)) : scope.deviceAliasList;
+        };
+
+        scope.createFilterForDeviceAlias = function (query) {
+            var lowercaseQuery = angular.lowercase(query);
+            return function filterFn(deviceAlias) {
+                return (angular.lowercase(deviceAlias.alias).indexOf(lowercaseQuery) === 0);
+            };
+        };
+
+        scope.updateView = function () {
+            ngModelCtrl.$setViewValue(scope.deviceAlias);
+            scope.updateValidity();
+        }
+
+        ngModelCtrl.$render = function () {
+            if (ngModelCtrl.$viewValue) {
+                scope.deviceAlias = ngModelCtrl.$viewValue;
+            }
+        }
+
+        scope.textIsNotEmpty = function(text) {
+            return (text && text != null && text.length > 0) ? true : false;
+        }
+
+        scope.deviceAliasEnter = function($event) {
+            if ($event.keyCode === $mdConstant.KEY_CODE.ENTER) {
+                $event.preventDefault();
+                if (!scope.deviceAlias) {
+                    var found = scope.deviceAliasSearch(scope.deviceAliasSearchText);
+                    found = found.length > 0;
+                    if (!found) {
+                        scope.createDeviceAlias($event, scope.deviceAliasSearchText);
+                    }
+                }
+            }
+        }
+
+        scope.createDeviceAlias = function (event, alias) {
+            var autoChild = $('#device-autocomplete', element)[0].firstElementChild;
+            var el = angular.element(autoChild);
+            el.scope().$mdAutocompleteCtrl.hidden = true;
+            el.scope().$mdAutocompleteCtrl.hasNotFound = false;
+            event.preventDefault();
+            var promise = scope.onCreateDeviceAlias({event: event, alias: alias});
+            if (promise) {
+                promise.then(
+                    function success(newAlias) {
+                        el.scope().$mdAutocompleteCtrl.hasNotFound = true;
+                        if (newAlias) {
+                            scope.deviceAliasList.push(newAlias);
+                            scope.deviceAlias = newAlias;
+                        }
+                    },
+                    function fail() {
+                        el.scope().$mdAutocompleteCtrl.hasNotFound = true;
+                    }
+                );
+            } else {
+                el.scope().$mdAutocompleteCtrl.hasNotFound = true;
+            }
+        };
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        link: linker,
+        scope: {
+            tbRequired: '=?',
+            deviceAliases: '=',
+            onCreateDeviceAlias: '&'
+        }
+    };
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/device-alias-select.scss b/ui/src/app/components/device-alias-select.scss
new file mode 100644
index 0000000..2ce533c
--- /dev/null
+++ b/ui/src/app/components/device-alias-select.scss
@@ -0,0 +1,30 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+.tb-device-alias-autocomplete {
+  .tb-not-found {
+    display: block;
+    line-height: 1.5;
+    height: 48px;
+    .tb-no-entries {
+      line-height: 48px;
+    }
+  }
+  li {
+    height: auto !important;
+    white-space: normal !important;
+  }
+}

diff --git a/ui/src/app/components/device-alias-select.tpl.html b/ui/src/app/components/device-alias-select.tpl.html
new file mode 100644
index 0000000..2fdd5d5
--- /dev/null
+++ b/ui/src/app/components/device-alias-select.tpl.html
@@ -0,0 +1,52 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section layout='column'>
+    <md-autocomplete id="device-autocomplete"
+                     md-input-name="device_alias"
+                     ng-required="tbRequired"
+                     ng-model="deviceAlias"
+                     md-selected-item="deviceAlias"
+                     md-search-text="deviceAliasSearchText"
+                     md-items="item in deviceAliasSearch(deviceAliasSearchText)"
+                     md-item-text="item.alias"
+                     tb-keydown="deviceAliasEnter($event)"
+                     tb-keypress="deviceAliasEnter($event)"
+                     md-min-length="0"
+                     placeholder="{{ 'device.device-alias' | translate }}"
+                     md-menu-class="tb-device-alias-autocomplete">
+        <md-item-template>
+            <span md-highlight-text="deviceAliasSearchText" md-highlight-flags="^i">{{item.alias}}</span>
+        </md-item-template>
+        <md-not-found>
+            <div class="tb-not-found">
+                <div class="tb-no-entries" ng-if="!textIsNotEmpty(deviceAliasSearchText)">
+                    <span translate>device.no-aliases-found</span>
+                </div>
+                <div ng-if="textIsNotEmpty(deviceAliasSearchText)">
+                    <span translate translate-values='{ alias: "{{deviceAliasSearchText | truncate:true:6:&apos;...&apos;}}" }'>device.no-alias-matching</span>
+                    <span>
+                        <a translate ng-click="createDeviceAlias($event, deviceAliasSearchText)">device.create-new-alias</a>
+                    </span>
+                </div>
+            </div>
+        </md-not-found>
+    </md-autocomplete>
+    <div class="tb-error-messages" ng-messages="ngModelCtrl.$error" role="alert">
+        <div translate ng-message="deviceAlias" class="tb-error-message">device.alias-required</div>
+    </div>
+</section>

diff --git a/ui/src/app/components/expand-fullscreen.directive.js b/ui/src/app/components/expand-fullscreen.directive.js
new file mode 100644
index 0000000..f5a078c
--- /dev/null
+++ b/ui/src/app/components/expand-fullscreen.directive.js
@@ -0,0 +1,140 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './expand-fullscreen.scss';
+
+import $ from 'jquery';
+
+export default angular.module('thingsboard.directives.expandFullscreen', [])
+    .directive('tbExpandFullscreen', ExpandFullscreen)
+    .name;
+
+/* eslint-disable angular/angularelement */
+
+/*@ngInject*/
+function ExpandFullscreen($compile, $document) {
+
+    var uniqueId = 1;
+    var linker = function (scope, element, attrs) {
+
+        scope.body = angular.element($document.find('body').eq(0));
+        scope.fullscreenParentId = 'fullscreen-parent' + uniqueId;
+        scope.fullscreenParent = $('#' + scope.fullscreenParentId, scope.body)[0];
+        if (!scope.fullscreenParent) {
+            uniqueId++;
+            var fullscreenParent = angular.element('<div id=\'' + scope.fullscreenParentId + '\' class=\'tb-fullscreen-parent\'></div>');
+            scope.body.append(fullscreenParent);
+            scope.fullscreenParent = $('#' + scope.fullscreenParentId, scope.body)[0];
+            scope.fullscreenParent = angular.element(scope.fullscreenParent);
+            scope.fullscreenParent.css('display', 'none');
+        } else {
+            scope.fullscreenParent = angular.element(scope.fullscreenParent);
+        }
+
+        scope.$on('$destroy', function () {
+            scope.fullscreenParent.remove();
+        });
+
+        scope.elementParent = null;
+        scope.expanded = false;
+        scope.fullscreenZindex = scope.fullscreenZindex();
+        if (!scope.fullscreenZindex) {
+            scope.fullscreenZindex = '70';
+        }
+
+        scope.$watch('expanded', function (newExpanded, prevExpanded) {
+            if (newExpanded != prevExpanded) {
+                if (scope.expanded) {
+                    scope.elementParent = element.parent();
+                    element.detach();
+                    scope.fullscreenParent.append(element);
+                    scope.fullscreenParent.css('display', '');
+                    scope.fullscreenParent.css('z-index', scope.fullscreenZindex);
+                    element.addClass('tb-fullscreen');
+                } else {
+                    if (scope.elementParent) {
+                        element.detach();
+                        scope.elementParent.append(element);
+                        scope.elementParent = null;
+                    }
+                    element.removeClass('tb-fullscreen');
+                    scope.fullscreenParent.css('display', 'none');
+                    scope.fullscreenParent.css('z-index', '');
+                }
+                if (scope.onFullscreenChanged) {
+                    scope.onFullscreenChanged({expanded: scope.expanded});
+                }
+            }
+        });
+
+        scope.$watch(function () {
+            return scope.expand();
+        }, function (newExpanded) {
+            scope.expanded = newExpanded;
+        });
+
+        scope.toggleExpand = function ($event) {
+            if ($event) {
+                $event.stopPropagation();
+            }
+            scope.expanded = !scope.expanded;
+        }
+
+        var expandButton = null;
+        if (attrs.expandButtonId) {
+            expandButton = $('#' + attrs.expandButtonId, element)[0];
+        }
+
+        var html = '<md-tooltip md-direction="{{expanded ? \'bottom\' : \'top\'}}">' +
+            '{{(expanded ? \'fullscreen.exit\' : \'fullscreen.expand\') | translate}}' +
+            '</md-tooltip>' +
+            '<ng-md-icon icon="{{expanded ? \'fullscreen_exit\' : \'fullscreen\'}}" ' +
+            'options=\'{"easing": "circ-in-out", "duration": 375, "rotation": "none"}\'>' +
+            '</ng-md-icon>';
+
+        if (expandButton) {
+            expandButton = angular.element(expandButton);
+            expandButton.attr('md-ink-ripple', 'false');
+            expandButton.append(html);
+
+            $compile(expandButton.contents())(scope);
+
+            expandButton.on("click", scope.toggleExpand);
+
+        } else if (!scope.hideExpandButton()) {
+            var button = angular.element('<md-button class="tb-fullscreen-button-style tb-fullscreen-button-pos md-icon-button" ' +
+                'md-ink-ripple="false" ng-click="toggleExpand($event)">' +
+                html +
+                '</md-button>');
+
+            $compile(button)(scope);
+
+            element.prepend(button);
+        }
+    }
+
+    return {
+        restrict: "A",
+        link: linker,
+        scope: {
+            expand: "&tbExpandFullscreen",
+            hideExpandButton: "&hideExpandButton",
+            onFullscreenChanged: "&onFullscreenChanged",
+            fullscreenZindex: "&fullscreenZindex"
+        }
+    };
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/expand-fullscreen.scss b/ui/src/app/components/expand-fullscreen.scss
new file mode 100644
index 0000000..1ff154f
--- /dev/null
+++ b/ui/src/app/components/expand-fullscreen.scss
@@ -0,0 +1,53 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import "../../scss/constants";
+
+.tb-fullscreen {
+  section.header-buttons {
+    top: 25px;
+  }
+}
+
+.tb-fullscreen {
+  width: 100% !important;
+  height: 100% !important;
+  position: fixed !important;
+  top: 0;
+  left: 0;
+}
+
+.tb-fullscreen-parent {
+  background-color: $gray;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+}
+
+.md-button.tb-fullscreen-button-style, .tb-fullscreen-button-style {
+  background: #ccc;
+  opacity: 0.85;
+  ng-md-icon {
+    color: #666;
+  }
+}
+
+.md-button.tb-fullscreen-button-pos, .tb-fullscreen-button-pos {
+  position: absolute;
+  top: 10px;
+  right: 10px;
+}

diff --git a/ui/src/app/components/grid.directive.js b/ui/src/app/components/grid.directive.js
new file mode 100644
index 0000000..ba8cdc1
--- /dev/null
+++ b/ui/src/app/components/grid.directive.js
@@ -0,0 +1,607 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './grid.scss';
+
+import thingsboardScopeElement from './scope-element.directive';
+import thingsboardDetailsSidenav from './details-sidenav.directive';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import gridTemplate from './grid.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.grid', [thingsboardScopeElement, thingsboardDetailsSidenav])
+    .directive('tbGrid', Grid)
+    .directive('tbGridCardContent', GridCardContent)
+    .filter('range', RangeFilter)
+    .name;
+
+/*@ngInject*/
+function RangeFilter() {
+    return function(input, total) {
+        total = parseInt(total);
+
+        for (var i=0; i<total; i++) {
+            input.push(i);
+        }
+
+        return input;
+    };
+}
+
+/*@ngInject*/
+function GridCardContent($compile) {
+    var linker = function(scope, element) {
+        scope.$watch('itemTemplate',
+            function(value) {
+                element.html(value);
+                $compile(element.contents())(scope);
+            }
+        );
+    };
+
+    return {
+        restrict: "E",
+        link: linker,
+        scope: {
+            parentCtl: "=parentCtl",
+            gridCtl: "=gridCtl",
+            itemTemplate: "=itemTemplate",
+            item: "=item"
+        }
+    };
+}
+
+/*@ngInject*/
+function Grid() {
+    return {
+        restrict: "E",
+        scope: true,
+        transclude: {
+            detailsButtons: '?detailsButtons'
+        },
+        bindToController: {
+            gridConfiguration: '&?'
+        },
+        controller: GridController,
+        controllerAs: 'vm',
+        templateUrl: gridTemplate
+    }
+}
+
+/*@ngInject*/
+function GridController($scope, $state, $mdDialog, $document, $q, $timeout, $translate, $mdMedia, $templateCache) {
+
+    var vm = this;
+
+    var columns = 1;
+    if ($mdMedia('md')) {
+        columns = 2;
+    } else if ($mdMedia('lg')) {
+        columns = 3;
+    } else if ($mdMedia('gt-lg')) {
+        columns = 4;
+    }
+
+    var pageSize = 10 * columns;
+
+    vm.columns = columns;
+
+    vm.addItem = addItem;
+    vm.deleteItem = deleteItem;
+    vm.deleteItems = deleteItems;
+    vm.hasData = hasData;
+    vm.isCurrentItem = isCurrentItem;
+    vm.moveToTop = moveToTop;
+    vm.noData = noData;
+    vm.onCloseDetails = onCloseDetails;
+    vm.onToggleDetailsEditMode = onToggleDetailsEditMode;
+    vm.openItem = openItem;
+    vm.operatingItem = operatingItem;
+    vm.refreshList = refreshList;
+    vm.saveItem = saveItem;
+    vm.toggleItemSelection = toggleItemSelection;
+
+    $scope.$watch(function () {
+        return $mdMedia('sm');
+    }, function (sm) {
+        if (sm) {
+            columnsUpdated(1);
+        }
+    });
+    $scope.$watch(function () {
+        return $mdMedia('md');
+    }, function (md) {
+        if (md) {
+            columnsUpdated(2);
+        }
+    });
+    $scope.$watch(function () {
+        return $mdMedia('lg');
+    }, function (lg) {
+        if (lg) {
+            columnsUpdated(3);
+        }
+    });
+    $scope.$watch(function () {
+        return $mdMedia('gt-lg');
+    }, function (gtLg) {
+        if (gtLg) {
+            columnsUpdated(4);
+        }
+    });
+
+    initGridConfiguration();
+
+    vm.itemRows = {
+        getItemAtIndex: function (index) {
+            if (index >= vm.items.rowData.length) {
+                vm.itemRows.fetchMoreItems_(index);
+                return null;
+            }
+            return vm.items.rowData[index];
+        },
+
+        getLength: function () {
+            if (vm.items.hasNext) {
+                return vm.items.rowData.length + pageSize;
+            } else {
+                return vm.items.rowData.length;
+            }
+        },
+
+        fetchMoreItems_: function () {
+            if (vm.items.hasNext && !vm.items.pending) {
+                var promise = vm.fetchItemsFunc(vm.items.nextPageLink);
+                if (promise) {
+                    vm.items.pending = true;
+                    promise.then(
+                        function success(items) {
+                            vm.items.data = vm.items.data.concat(items.data);
+                            var startIndex = vm.items.data.length - items.data.length;
+                            var endIndex = vm.items.data.length;
+                            for (var i = startIndex; i < endIndex; i++) {
+                                var item = vm.items.data[i];
+                                item.index = i;
+                                var row = Math.floor(i / vm.columns);
+                                var itemRow = vm.items.rowData[row];
+                                if (!itemRow) {
+                                    itemRow = [];
+                                    vm.items.rowData.push(itemRow);
+                                }
+                                itemRow.push(item);
+                            }
+                            vm.items.nextPageLink = items.nextPageLink;
+                            vm.items.hasNext = items.hasNext;
+                            if (vm.items.hasNext) {
+                                vm.items.nextPageLink.limit = pageSize;
+                            }
+                            vm.items.pending = false;
+                        },
+                        function fail() {
+                            vm.items.hasNext = false;
+                            vm.items.pending = false;
+                        });
+                } else {
+                    vm.items.hasNext = false;
+                }
+            }
+        }
+    };
+
+    function columnsUpdated(newColumns) {
+        if (vm.columns !== newColumns) {
+            var newTopIndex = Math.ceil(vm.columns * vm.topIndex / newColumns);
+            pageSize = 10 * newColumns;
+            vm.items.rowData = [];
+            if (vm.items.nextPageLink) {
+                vm.items.nextPageLink.limit = pageSize;
+            }
+
+            for (var i = 0; i < vm.items.data.length; i++) {
+                var item = vm.items.data[i];
+                var row = Math.floor(i / newColumns);
+                var itemRow = vm.items.rowData[row];
+                if (!itemRow) {
+                    itemRow = [];
+                    vm.items.rowData.push(itemRow);
+                }
+                itemRow.push(item);
+            }
+
+            vm.columns = newColumns;
+            vm.topIndex = newTopIndex;
+            vm.itemRows.getItemAtIndex(newTopIndex+pageSize);
+            $timeout(function() {
+                moveToIndex(newTopIndex);
+            }, 500);
+        }
+    }
+
+    function initGridConfiguration() {
+        vm.gridConfiguration = vm.gridConfiguration || function () {
+                return {};
+            };
+
+        vm.config = vm.gridConfiguration();
+
+        vm.itemHeight = vm.config.itemHeight || 199;
+
+        vm.refreshParamsFunc = vm.config.refreshParamsFunc || function () {
+                return {"topIndex": vm.topIndex};
+            };
+
+        vm.deleteItemTitleFunc = vm.config.deleteItemTitleFunc || function () {
+                return $translate.instant('grid.delete-item-title');
+            };
+
+        vm.deleteItemContentFunc = vm.config.deleteItemContentFunc || function () {
+                return $translate.instant('grid.delete-item-text');
+            };
+
+        vm.deleteItemsTitleFunc = vm.config.deleteItemsTitleFunc || function () {
+                return $translate.instant('grid.delete-items-title', {count: vm.items.selectedCount}, 'messageformat');
+            };
+
+        vm.deleteItemsActionTitleFunc = vm.config.deleteItemsActionTitleFunc || function (selectedCount) {
+                return $translate.instant('grid.delete-items-action-title', {count: selectedCount}, 'messageformat');
+            };
+
+        vm.deleteItemsContentFunc = vm.config.deleteItemsContentFunc || function () {
+                return $translate.instant('grid.delete-items-text');
+            };
+
+        vm.fetchItemsFunc = vm.config.fetchItemsFunc || function () {
+                return $q.when([]);
+            };
+
+        vm.saveItemFunc = vm.config.saveItemFunc || function (item) {
+                return $q.when(item);
+            };
+
+        vm.deleteItemFunc = vm.config.deleteItemFunc || function () {
+                return $q.when();
+            };
+
+        vm.clickItemFunc = vm.config.clickItemFunc || function ($event, item) {
+                vm.openItem($event, item);
+            };
+
+        vm.itemCardTemplate = '<span></span>';
+        if (vm.config.itemCardTemplate) {
+            vm.itemCardTemplate = vm.config.itemCardTemplate;
+        } else if (vm.config.itemCardTemplateUrl) {
+            vm.itemCardTemplate = $templateCache.get(vm.config.itemCardTemplateUrl);
+        }
+
+        vm.parentCtl = vm.config.parentCtl || vm;
+
+        vm.getItemTitleFunc = vm.config.getItemTitleFunc || function () {
+                return '';
+            };
+
+        vm.actionsList = vm.config.actionsList || [];
+
+        for (var i = 0; i < vm.actionsList.length; i++) {
+            var action = vm.actionsList[i];
+            action.isEnabled = action.isEnabled || function() {
+                    return true;
+                };
+        }
+
+        vm.groupActionsList = vm.config.groupActionsList || [
+                {
+                    onAction: function ($event) {
+                        deleteItems($event);
+                    },
+                    name: function() { return $translate.instant('action.delete') },
+                    details: vm.deleteItemsActionTitleFunc,
+                    icon: "delete"
+                }
+            ];
+
+        vm.addItemText = vm.config.addItemText || function () {
+                return $translate.instant('grid.add-item-text');
+            };
+
+        vm.addItemAction = vm.config.addItemAction || {
+                onAction: function ($event) {
+                    addItem($event);
+                },
+                name: function() { return $translate.instant('action.add') },
+                details: function() { return vm.addItemText() },
+                icon: "add"
+            };
+
+        vm.onGridInited = vm.config.onGridInited || function () {
+            };
+
+        vm.addItemTemplateUrl = vm.config.addItemTemplateUrl;
+
+        vm.noItemsText = vm.config.noItemsText || function () {
+                return $translate.instant('grid.no-items-text');
+            };
+
+        vm.itemDetailsText = vm.config.itemDetailsText || function () {
+                return $translate.instant('grid.item-details');
+            };
+
+        vm.isDetailsReadOnly = vm.config.isDetailsReadOnly || function () {
+                return false;
+            };
+
+        vm.isSelectionEnabled = vm.config.isSelectionEnabled || function () {
+                return true;
+            };
+
+        vm.topIndex = vm.config.topIndex || 0;
+
+        vm.items = vm.config.items || {
+                data: [],
+                rowData: [],
+                nextPageLink: {
+                    limit: vm.topIndex + pageSize,
+                    textSearch: $scope.searchConfig.searchText
+                },
+                selections: {},
+                selectedCount: 0,
+                hasNext: true,
+                pending: false
+            };
+
+        vm.detailsConfig = {
+            isDetailsOpen: false,
+            isDetailsEditMode: false,
+            currentItem: null,
+            editingItem: null
+        };
+    }
+
+    $scope.$on('searchTextUpdated', function () {
+        vm.items = {
+            data: [],
+            rowData: [],
+            nextPageLink: {
+                limit: pageSize,
+                textSearch: $scope.searchConfig.searchText
+            },
+            selections: {},
+            selectedCount: 0,
+            hasNext: true,
+            pending: false
+        };
+        vm.detailsConfig.isDetailsOpen = false;
+        vm.itemRows.getItemAtIndex(pageSize);
+    });
+
+    vm.onGridInited(vm);
+
+    vm.itemRows.getItemAtIndex(pageSize);
+
+    function refreshList() {
+        $state.go($state.current, vm.refreshParamsFunc(), {reload: true});
+    }
+
+    function addItem($event) {
+        $mdDialog.show({
+            controller: AddItemController,
+            controllerAs: 'vm',
+            templateUrl: vm.addItemTemplateUrl,
+            parent: angular.element($document[0].body),
+            locals: {saveItemFunction: vm.saveItemFunc},
+            fullscreen: true,
+            targetEvent: $event
+        }).then(function () {
+            refreshList();
+        }, function () {
+        });
+    }
+
+    function openItem($event, item) {
+        $event.stopPropagation();
+        if (vm.detailsConfig.currentItem != null && vm.detailsConfig.currentItem.id.id === item.id.id) {
+            if (vm.detailsConfig.isDetailsOpen) {
+                vm.detailsConfig.isDetailsOpen = false;
+                return;
+            }
+        }
+        vm.detailsConfig.currentItem = item;
+        vm.detailsConfig.isDetailsEditMode = false;
+        vm.detailsConfig.isDetailsOpen = true;
+    }
+
+    function isCurrentItem(item) {
+        if (item != null && vm.detailsConfig.currentItem != null &&
+            vm.detailsConfig.currentItem.id.id === item.id.id) {
+            return vm.detailsConfig.isDetailsOpen;
+        } else {
+            return false;
+        }
+    }
+
+    function onToggleDetailsEditMode(theForm) {
+        if (!vm.detailsConfig.isDetailsEditMode) {
+            theForm.$setPristine();
+        }
+    }
+
+    function onCloseDetails() {
+        vm.detailsConfig.currentItem = null;
+    }
+
+    function operatingItem() {
+        if (!vm.detailsConfig.isDetailsEditMode) {
+            if (vm.detailsConfig.editingItem) {
+                vm.detailsConfig.editingItem = null;
+            }
+            return vm.detailsConfig.currentItem;
+        } else {
+            if (!vm.detailsConfig.editingItem) {
+                vm.detailsConfig.editingItem = angular.copy(vm.detailsConfig.currentItem);
+            }
+            return vm.detailsConfig.editingItem;
+        }
+    }
+
+    function saveItem(theForm) {
+        vm.saveItemFunc(vm.detailsConfig.editingItem).then(function success(item) {
+            theForm.$setPristine();
+            vm.detailsConfig.isDetailsEditMode = false;
+            var index = vm.detailsConfig.currentItem.index;
+            item.index = index;
+            vm.detailsConfig.currentItem = item;
+            vm.items.data[index] = item;
+            var row = Math.floor(index / vm.columns);
+            var itemRow = vm.items.rowData[row];
+            var column = index % vm.columns;
+            itemRow[column] = item;
+        });
+    }
+
+    function deleteItem($event, item) {
+        if ($event) {
+            $event.stopPropagation();
+        }
+        var confirm = $mdDialog.confirm()
+            .targetEvent($event)
+            .title(vm.deleteItemTitleFunc(item))
+            .htmlContent(vm.deleteItemContentFunc(item))
+            .ariaLabel($translate.instant('grid.delete-item'))
+            .cancel($translate.instant('action.no'))
+            .ok($translate.instant('action.yes'));
+        $mdDialog.show(confirm).then(function () {
+                vm.deleteItemFunc(item.id.id).then(function success() {
+                    refreshList();
+                });
+            },
+            function () {
+            });
+
+    }
+
+    function deleteItems($event) {
+        var confirm = $mdDialog.confirm()
+            .targetEvent($event)
+            .title(vm.deleteItemsTitleFunc(vm.items.selectedCount))
+            .htmlContent(vm.deleteItemsContentFunc())
+            .ariaLabel($translate.instant('grid.delete-items'))
+            .cancel($translate.instant('action.no'))
+            .ok($translate.instant('action.yes'));
+        $mdDialog.show(confirm).then(function () {
+                var tasks = [];
+                for (var id in vm.items.selections) {
+                    tasks.push(vm.deleteItemFunc(id));
+                }
+                $q.all(tasks).then(function () {
+                    refreshList();
+                });
+            },
+            function () {
+            });
+    }
+
+
+    function toggleItemSelection($event, item) {
+        $event.stopPropagation();
+        var selected = angular.isDefined(item.selected) && item.selected;
+        item.selected = !selected;
+        if (item.selected) {
+            vm.items.selections[item.id.id] = true;
+            vm.items.selectedCount++;
+        } else {
+            delete vm.items.selections[item.id.id];
+            vm.items.selectedCount--;
+        }
+    }
+
+    function moveToTop() {
+        moveToIndex(0, true);
+    }
+
+    function moveToIndex(index, animate) {
+        var repeatContainer = $scope.repeatContainer[0];
+        var scrollElement = repeatContainer.children[0];
+        var startY = scrollElement.scrollTop;
+        var stopY = index * vm.itemHeight;
+        if (stopY > 0) {
+            stopY+= 16;
+        }
+        var distance = Math.abs(startY - stopY);
+        if (distance < 100 || !animate) {
+            scrollElement.scrollTop = stopY;
+            return;
+        }
+        var upElseDown = stopY < startY;
+        var speed = Math.round(distance / 100);
+        if (speed >= 20) speed = 20;
+        var step = Math.round(distance / 25);
+
+        var leapY = upElseDown ? startY - step : startY + step;
+        var timer = 0;
+        for (var i = startY; upElseDown ? (i > stopY) : (i < stopY); upElseDown ? (i -= step) : (i += step)) {
+            $timeout(function (topY) {
+                scrollElement.scrollTop = topY;
+            }, timer * speed, true, leapY);
+            if (upElseDown) {
+                leapY -= step;
+                if (leapY < stopY) {
+                    leapY = stopY;
+                }
+            } else {
+                leapY += step;
+                if (leapY > stopY) {
+                    leapY = stopY;
+                }
+            }
+            timer++;
+        }
+
+    }
+
+    function noData() {
+        return vm.items.data.length == 0 && !vm.items.hasNext;
+    }
+
+    function hasData() {
+        return vm.items.data.length > 0;
+    }
+
+}
+
+/*@ngInject*/
+function AddItemController($scope, $mdDialog, saveItemFunction, helpLinks) {
+
+    var vm = this;
+
+    vm.helpLinks = helpLinks;
+    vm.item = {};
+
+    vm.add = add;
+    vm.cancel = cancel;
+
+    function cancel() {
+        $mdDialog.cancel();
+    }
+
+    function add() {
+        saveItemFunction(vm.item).then(function success(item) {
+            vm.item = item;
+            $scope.theForm.$setPristine();
+            $mdDialog.hide();
+        });
+    }
+}
\ No newline at end of file

diff --git a/ui/src/app/components/grid.scss b/ui/src/app/components/grid.scss
new file mode 100644
index 0000000..549b8eb
--- /dev/null
+++ b/ui/src/app/components/grid.scss
@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import "~compass-sass-mixins/lib/animate";
+
+.tb-uppercase {
+  text-transform: uppercase;
+}
+
+.tb-card-item {
+  @include transition(all .2s ease-in-out);
+}
+
+.tb-current-item {
+  opacity: 0.5;
+  @include transform(scale(1.05));
+}
+
+#tb-vertical-container {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}

diff --git a/ui/src/app/components/grid.tpl.html b/ui/src/app/components/grid.tpl.html
new file mode 100644
index 0000000..16d38f3
--- /dev/null
+++ b/ui/src/app/components/grid.tpl.html
@@ -0,0 +1,102 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<span layout-align="center center"
+      style="text-transform: uppercase; display: flex;"
+      class="md-headline tb-absolute-fill"
+      ng-show="vm.noData()">{{vm.noItemsText()}}</span>
+<section layout="row" flex style="height: 100%;" flex layout-wrap>
+    <div layout="column" style="height: 100%;" flex layout-wrap>
+        <md-virtual-repeat-container ng-show="vm.hasData()" tb-scope-element="repeatContainer" id="tb-vertical-container" md-top-index="vm.topIndex" flex>
+            <div class="md-padding" layout="column">
+                <section layout="row"  md-virtual-repeat="rowItem in vm.itemRows" md-on-demand md-item-size="vm.itemHeight">
+                    <div flex ng-repeat="n in [] | range:vm.columns" ng-style="{'height':vm.itemHeight+'px'}">
+                        <md-card ng-if="rowItem[n]"
+                                 ng-class="{'tb-current-item': vm.isCurrentItem(rowItem[n])}"
+                                 class="repeated-item tb-card-item" ng-style="{'height':(vm.itemHeight-16)+'px','cursor':'pointer'}"
+                                 ng-click="vm.clickItemFunc($event, rowItem[n])">
+                            <section layout="row" layout-wrap>
+                                <md-card-title layout="row">
+                                    <section layout="column" layout-wrap>
+                                        <md-checkbox ng-if="vm.isSelectionEnabled(rowItem[n])" ng-click="vm.toggleItemSelection($event, rowItem[n])"
+                                                     layout-align="start start" aria-label="{{ 'item.selected' | translate }}" ng-checked="rowItem[n].selected">
+                                        </md-checkbox>
+                                        <span flex></span>
+                                    </section>
+                                    <md-card-title-text>
+                                        <span class="md-headline">{{vm.getItemTitleFunc(rowItem[n])}}</span>
+                                    </md-card-title-text>
+                                </md-card-title>
+                            </section>
+                            <md-card-content flex>
+                                <tb-grid-card-content grid-ctl="vm" parent-ctl="vm.parentCtl" item-template="vm.itemCardTemplate" item="rowItem[n]"></tb-grid-card-content>
+                            </md-card-content>
+                            <md-card-actions layout="row" layout-align="end end">
+                                <md-button ng-if="action.isEnabled(rowItem[n])" ng-disabled="loading" class="md-icon-button md-primary" ng-repeat="action in vm.actionsList"
+                                           ng-click="action.onAction($event, rowItem[n])" aria-label="{{ action.name() }}">
+                                    <md-tooltip md-direction="top">
+                                        {{ action.details() }}
+                                    </md-tooltip>
+                                    <ng-md-icon icon="{{action.icon}}"></ng-md-icon>
+                                </md-button>
+                            </md-card-actions>
+                        </md-card>
+                    </div>
+                </section>
+            </div>
+        </md-virtual-repeat-container>
+    </div>
+    <tb-details-sidenav
+            header-title="vm.getItemTitleFunc(vm.operatingItem())"
+            header-subtitle="{{vm.itemDetailsText()}}"
+            is-read-only="vm.isDetailsReadOnly(vm.operatingItem())"
+            is-open="vm.detailsConfig.isDetailsOpen"
+            is-edit="vm.detailsConfig.isDetailsEditMode"
+            on-close-details="vm.onCloseDetails()"
+            on-toggle-details-edit-mode="vm.onToggleDetailsEditMode(vm.detailsForm)"
+            on-apply-details="vm.saveItem(vm.detailsForm)"
+            the-form="vm.detailsForm">
+        <details-buttons>
+            <div ng-transclude="detailsButtons"></div>
+        </details-buttons>
+        <form name="vm.detailsForm">
+            <div ng-transclude></div>
+        </form>
+    </tb-details-sidenav>
+</section>
+
+<section layout="row" layout-wrap class="tb-footer-buttons md-fab ">
+    <md-button ng-disabled="loading" ng-show="vm.items.selectedCount > 0" class="tb-btn-footer md-accent md-hue-2 md-fab" ng-repeat="groupAction in vm.groupActionsList"
+               ng-click="groupAction.onAction($event, vm.items)" aria-label="{{ groupAction.name() }}">
+        <md-tooltip md-direction="top">
+            {{ groupAction.details(vm.items.selectedCount) }}
+        </md-tooltip>
+        <ng-md-icon icon="{{groupAction.icon}}"></ng-md-icon>
+    </md-button>
+    <md-button ng-disabled="loading" ng-show="vm.topIndex > 0" class="tb-btn-footer md-primary md-hue-1 md-fab" ng-click="vm.moveToTop()" aria-label="{{'grid.scroll-to-top' | translate}}" >
+        <md-tooltip md-direction="top">
+            {{'grid.scroll-to-top' | translate}}
+        </md-tooltip>
+        <ng-md-icon icon="arrow_drop_up"></ng-md-icon>
+    </md-button>
+    <md-button ng-disabled="loading" ng-if="vm.addItemAction.name()" class="tb-btn-footer md-accent md-hue-2 md-fab" ng-click="vm.addItemAction.onAction($event)" aria-label="{{ vm.addItemAction.name() }}" >
+        <md-tooltip md-direction="top">
+            {{ vm.addItemAction.details() }}
+        </md-tooltip>
+        <ng-md-icon icon="{{ vm.addItemAction.icon }}"></ng-md-icon>
+    </md-button>
+</section>
\ No newline at end of file

diff --git a/ui/src/app/components/js-func.directive.js b/ui/src/app/components/js-func.directive.js
new file mode 100644
index 0000000..8247b2b
--- /dev/null
+++ b/ui/src/app/components/js-func.directive.js
@@ -0,0 +1,203 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './js-func.scss';
+
+import ace from 'brace';
+import 'brace/ext/language_tools';
+import $ from 'jquery';
+import thingsboardToast from '../services/toast';
+import thingsboardUtils from '../common/utils.service';
+import thingsboardExpandFullscreen from './expand-fullscreen.directive';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import jsFuncTemplate from './js-func.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/* eslint-disable angular/angularelement */
+
+export default angular.module('thingsboard.directives.jsFunc', [thingsboardToast, thingsboardUtils, thingsboardExpandFullscreen])
+    .directive('tbJsFunc', JsFunc)
+    .name;
+
+/*@ngInject*/
+function JsFunc($compile, $templateCache, toast, utils, $translate) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var template = $templateCache.get(jsFuncTemplate);
+        element.html(template);
+
+        scope.functionArgs = scope.$eval(attrs.functionArgs);
+        scope.validationArgs = scope.$eval(attrs.validationArgs);
+        scope.resultType = attrs.resultType;
+        if (!scope.resultType || scope.resultType.length === 0) {
+            scope.resultType = "nocheck";
+        }
+
+        scope.functionValid = true;
+
+        var Range = ace.acequire("ace/range").Range;
+        scope.js_editor;
+        scope.errorMarkers = [];
+
+
+        scope.functionArgsString = '';
+        for (var i in scope.functionArgs) {
+            if (scope.functionArgsString.length > 0) {
+                scope.functionArgsString += ', ';
+            }
+            scope.functionArgsString += scope.functionArgs[i];
+        }
+
+        scope.onFullscreenChanged = function () {
+            if (scope.js_editor) {
+                scope.js_editor.resize();
+                scope.js_editor.renderer.updateFull();
+            }
+        };
+
+        scope.jsEditorOptions = {
+            useWrapMode: true,
+            mode: 'javascript',
+            advanced: {
+                enableSnippets: true,
+                enableBasicAutocompletion: true,
+                enableLiveAutocompletion: true
+            },
+            onLoad: function (_ace) {
+                scope.js_editor = _ace;
+                scope.js_editor.session.on("change", function () {
+                    scope.cleanupJsErrors();
+                });
+            }
+        };
+
+        scope.cleanupJsErrors = function () {
+            toast.hide();
+            for (var i = 0; i < scope.errorMarkers.length; i++) {
+                scope.js_editor.session.removeMarker(scope.errorMarkers[i]);
+            }
+            scope.errorMarkers = [];
+            if (scope.errorAnnotationId && scope.errorAnnotationId > -1) {
+                var annotations = scope.js_editor.session.getAnnotations();
+                annotations.splice(scope.errorAnnotationId, 1);
+                scope.js_editor.session.setAnnotations(annotations);
+                scope.errorAnnotationId = -1;
+            }
+        }
+
+        scope.updateValidity = function () {
+            ngModelCtrl.$setValidity('functionBody', scope.functionValid);
+        };
+
+        scope.$watch('functionBody', function (newFunctionBody, oldFunctionBody) {
+            ngModelCtrl.$setViewValue(scope.functionBody);
+            if (!angular.equals(newFunctionBody, oldFunctionBody)) {
+                scope.functionValid = true;
+            }
+            scope.updateValidity();
+        });
+
+        ngModelCtrl.$render = function () {
+            scope.functionBody = ngModelCtrl.$viewValue;
+        };
+
+        scope.showError = function (error) {
+            var toastParent = $('#tb-javascript-panel', element);
+            var dialogContent = toastParent.closest('md-dialog-content');
+            if (dialogContent.length > 0) {
+                toastParent = dialogContent;
+            }
+            toast.showError(error, toastParent, 'bottom left');
+        }
+
+        scope.validate = function () {
+            try {
+                var toValidate = new Function(scope.functionArgsString, scope.functionBody);
+                var res = toValidate.apply(this, scope.validationArgs);
+                if (scope.resultType != 'nocheck') {
+                    if (scope.resultType === 'any') {
+                        if (angular.isUndefined(res)) {
+                            scope.showError($translate.instant('js-func.no-return-error'));
+                            return false;
+                        }
+                    } else {
+                        var resType = typeof res;
+                        if (resType != scope.resultType) {
+                            scope.showError($translate.instant('js-func.return-type-mismatch', {type: scope.resultType}));
+                            return false;
+                        }
+                    }
+                }
+                return true;
+            } catch (e) {
+                var details = utils.parseException(e);
+                var errorInfo = 'Error:';
+                if (details.name) {
+                    errorInfo += ' ' + details.name + ':';
+                }
+                if (details.message) {
+                    errorInfo += ' ' + details.message;
+                }
+                if (details.lineNumber) {
+                    errorInfo += '<br>Line ' + details.lineNumber;
+                    if (details.columnNumber) {
+                        errorInfo += ' column ' + details.columnNumber;
+                    }
+                    errorInfo += ' of script.';
+                }
+                scope.showError(errorInfo);
+                if (scope.js_editor && details.lineNumber) {
+                    var line = details.lineNumber - 1;
+                    var column = 0;
+                    if (details.columnNumber) {
+                        column = details.columnNumber;
+                    }
+
+                    var errorMarkerId = scope.js_editor.session.addMarker(new Range(line, 0, line, Infinity), "ace_active-line", "screenLine");
+                    scope.errorMarkers.push(errorMarkerId);
+                    var annotations = scope.js_editor.session.getAnnotations();
+                    var errorAnnotation = {
+                        row: line,
+                        column: column,
+                        text: details.message,
+                        type: "error"
+                    };
+                    scope.errorAnnotationId = annotations.push(errorAnnotation) - 1;
+                    scope.js_editor.session.setAnnotations(annotations);
+                }
+                return false;
+            }
+        };
+
+        scope.$on('form-submit', function () {
+            scope.functionValid = scope.validate();
+            scope.updateValidity();
+        });
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        scope: {},
+        link: linker
+    };
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/js-func.scss b/ui/src/app/components/js-func.scss
new file mode 100644
index 0000000..b251e33
--- /dev/null
+++ b/ui/src/app/components/js-func.scss
@@ -0,0 +1,31 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+tb-js-func {
+  position: relative;
+}
+
+.tb-js-func-panel {
+  margin-left: 15px;
+  border: 1px solid #C0C0C0;
+  height: 100%;
+  #tb-javascript-input {
+    min-width: 400px;
+    min-height: 200px;
+    width: 100%;
+    height: 100%;
+  }
+}

diff --git a/ui/src/app/components/js-func.tpl.html b/ui/src/app/components/js-func.tpl.html
new file mode 100644
index 0000000..2c52232
--- /dev/null
+++ b/ui/src/app/components/js-func.tpl.html
@@ -0,0 +1,33 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div style="background: #fff;" tb-expand-fullscreen fullscreen-zindex="100" expand-button-id="expand-button" on-fullscreen-changed="onFullscreenChanged()" layout="column">
+	<div layout="row" layout-align="start center" style="height: 40px;">
+		<span style="font-style: italic;">function({{ functionArgsString }}) {</span>
+		<span flex></span>
+		<md-button id="expand-button" aria-label="Fullscreen" class="md-icon-button tb-md-32 tb-fullscreen-button-style"></md-button>
+	</div>
+	<div flex id="tb-javascript-panel" class="tb-js-func-panel" layout="column">
+		<div flex id="tb-javascript-input"
+			 ui-ace="jsEditorOptions" 
+			 ng-model="functionBody">
+		</div>
+	</div>
+	<div layout="row" layout-align="start center"  style="height: 40px;">
+		<span style="font-style: italic;">}</span>
+	</div>	   
+</div>
\ No newline at end of file

diff --git a/ui/src/app/components/json-form.directive.js b/ui/src/app/components/json-form.directive.js
new file mode 100644
index 0000000..a7f187d
--- /dev/null
+++ b/ui/src/app/components/json-form.directive.js
@@ -0,0 +1,243 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './json-form.scss';
+
+import tinycolor from 'tinycolor2';
+import ObjectPath from 'objectpath';
+import inspector from 'schema-inspector';
+import ReactSchemaForm from './react/json-form-react.jsx';
+import jsonFormTemplate from './json-form.tpl.html';
+import { utils } from 'react-schema-form';
+
+export default angular.module('thingsboard.directives.jsonForm', [])
+    .directive('tbJsonForm', JsonForm)
+    .value('ReactSchemaForm', ReactSchemaForm)
+    .name;
+
+/*@ngInject*/
+function JsonForm($compile, $templateCache, $mdColorPicker) {
+
+    var linker = function (scope, element) {
+
+        var template = $templateCache.get(jsonFormTemplate);
+
+        element.html(template);
+
+        var childScope;
+
+        var destroyModelChangeWatches = function() {
+            if (scope.modelWatchHandle) {
+                scope.modelWatchHandle();
+            }
+            if (scope.modelRefWatchHandle) {
+                scope.modelRefWatchHandle();
+            }
+        }
+
+        var initModelChangeWatches = function() {
+            scope.modelWatchHandle = scope.$watch('model',function(newValue, prevValue) {
+                if (newValue && prevValue && !angular.equals(newValue,prevValue)) {
+                    scope.validate();
+                    if (scope.formControl) {
+                        scope.formControl.$setDirty();
+                    }
+                }
+            }, true);
+            scope.modelRefWatchHandle = scope.$watch('model',function(newValue, prevValue) {
+                if (newValue && newValue != prevValue) {
+                    scope.updateValues();
+                }
+            });
+        };
+
+        var recompile = function() {
+            if (childScope) {
+                childScope.$destroy();
+            }
+            childScope = scope.$new();
+            $compile(element.contents())(childScope);
+        }
+
+        scope.formProps = {
+            option: {
+                formDefaults: {
+                    startEmpty: true
+                }
+            },
+            onModelChange: function(key, val) {
+                if (angular.isString(val) && val === '') {
+                    val = undefined;
+                }
+                selectOrSet(key, scope.model, val);
+            },
+            onColorClick: function(event, key, val) {
+                scope.showColorPicker(event, val);
+            }
+        };
+
+        scope.showColorPicker = function (event, color) {
+            $mdColorPicker.show({
+                value: tinycolor(color).toRgbString(),
+                defaultValue: '#fff',
+                random: tinycolor.random(),
+                clickOutsideToClose: false,
+                hasBackdrop: false,
+                skipHide: true,
+                preserveScope: false,
+
+                mdColorAlphaChannel: true,
+                mdColorSpectrum: true,
+                mdColorSliders: true,
+                mdColorGenericPalette: false,
+                mdColorMaterialPalette: true,
+                mdColorHistory: false,
+                mdColorDefaultTab: 2,
+
+                $event: event
+
+            }).then(function (color) {
+                if (event.data && event.data.onValueChanged) {
+                    event.data.onValueChanged(tinycolor(color).toRgb());
+                }
+            });
+        }
+
+        scope.validate = function(){
+            if (scope.schema && scope.model) {
+                var result = utils.validateBySchema(scope.schema, scope.model);
+                if (scope.formControl) {
+                    scope.formControl.$setValidity('jsonForm', result.valid);
+                }
+            }
+        }
+
+        scope.updateValues = function(skipRerender) {
+            destroyModelChangeWatches();
+            if (!skipRerender) {
+                element.html(template);
+            }
+            var readonly = (scope.readonly && scope.readonly === true) ? true : false;
+            var schema = scope.schema ? angular.copy(scope.schema) : {
+                    type: 'object'
+                };
+            schema.strict = true;
+            var form = scope.form ? angular.copy(scope.form) : [ "*" ];
+            var model = scope.model || {};
+            scope.model = inspector.sanitize(schema, model).data;
+            scope.formProps.option.formDefaults.readonly = readonly;
+            scope.formProps.schema = schema;
+            scope.formProps.form = form;
+            scope.formProps.model = angular.copy(scope.model);
+            if (!skipRerender) {
+                recompile();
+            }
+            initModelChangeWatches();
+        }
+
+        scope.updateValues(true);
+
+        scope.$watch('readonly',function() {
+            scope.updateValues();
+        });
+
+        scope.$watch('schema',function(newValue, prevValue) {
+            if (newValue && newValue != prevValue) {
+                scope.updateValues();
+                scope.validate();
+            }
+        });
+
+        scope.$watch('form',function(newValue, prevValue) {
+            if (newValue && newValue != prevValue) {
+                scope.updateValues();
+            }
+        });
+
+        scope.validate();
+
+        recompile();
+
+    }
+
+    return {
+        restrict: "E",
+        scope: {
+            schema: '=',
+            form: '=',
+            model: '=',
+            formControl: '=',
+            readonly: '='
+        },
+        link: linker
+    };
+
+}
+
+function setValue(obj, key, val) {
+    var changed = false;
+    if (obj) {
+        if (angular.isUndefined(val)) {
+            if (angular.isDefined(obj[key])) {
+                delete obj[key];
+                changed = true;
+            }
+        } else {
+            changed = !angular.equals(obj[key], val);
+            obj[key] = val;
+        }
+    }
+    return changed;
+}
+
+function selectOrSet(projection, obj, valueToSet) {
+    var numRe = /^\d+$/;
+
+    if (!obj) {
+        obj = this;
+    }
+
+    if (!obj) {
+        return false;
+    }
+
+    var parts = angular.isString(projection) ? ObjectPath.parse(projection) : projection;
+
+    if (parts.length === 1) {
+        return setValue(obj, parts[0], valueToSet);
+    }
+
+    if (angular.isUndefined(obj[parts[0]])) {
+        obj[parts[0]] = parts.length > 2 && numRe.test(parts[1]) ? [] : {};
+    }
+
+    var value = obj[parts[0]];
+    for (var i = 1; i < parts.length; i++) {
+        if (parts[i] === '') {
+            return false;
+        }
+        if (i === parts.length - 1) {
+            return setValue(value, parts[i], valueToSet);
+        } else {
+            var tmp = value[parts[i]];
+            if (angular.isUndefined(tmp) || tmp === null) {
+                tmp = numRe.test(parts[i + 1]) ? [] : {};
+                value[parts[i]] = tmp;
+            }
+            value = tmp;
+        }
+    }
+    return value;
+}

diff --git a/ui/src/app/components/json-form.scss b/ui/src/app/components/json-form.scss
new file mode 100644
index 0000000..79cdde9
--- /dev/null
+++ b/ui/src/app/components/json-form.scss
@@ -0,0 +1,19 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+tb-json-form {
+  overflow: auto;
+  padding-bottom: 14px !important;
+}
\ No newline at end of file

diff --git a/ui/src/app/components/json-form.tpl.html b/ui/src/app/components/json-form.tpl.html
new file mode 100644
index 0000000..fb79640
--- /dev/null
+++ b/ui/src/app/components/json-form.tpl.html
@@ -0,0 +1,18 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<react-component name="ReactSchemaForm" props="formProps" watch-depth="value"></react-component>
\ No newline at end of file

diff --git a/ui/src/app/components/led-light.directive.js b/ui/src/app/components/led-light.directive.js
new file mode 100644
index 0000000..edd430c
--- /dev/null
+++ b/ui/src/app/components/led-light.directive.js
@@ -0,0 +1,110 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import Raphael from 'raphael';
+import tinycolor from 'tinycolor2';
+import $ from 'jquery';
+
+/* eslint-disable angular/angularelement */
+
+export default angular.module('thingsboard.directives.ledLight', [])
+    .directive('tbLedLight', LedLight).name;
+
+/*@ngInject*/
+function LedLight($compile) {
+
+    var linker = function (scope, element) {
+        scope.offOpacity = scope.offOpacity || "0.4";
+        scope.glowColor = tinycolor(scope.colorOn).lighten().toHexString();
+
+        scope.$watch('tbEnabled',function() {
+            scope.draw();
+        });
+
+        scope.$watch('size',function() {
+            scope.update();
+        });
+
+        scope.draw = function () {
+            if (scope.tbEnabled) {
+                scope.circleElement.attr("fill", scope.colorOn);
+                scope.circleElement.attr("stroke", scope.colorOn);
+                scope.circleElement.attr("opacity", "1");
+
+                if (scope.circleElement.theGlow) {
+                    scope.circleElement.theGlow.remove();
+                }
+
+                scope.circleElement.theGlow = scope.circleElement.glow(
+                    {
+                        color: scope.glowColor,
+                        width: scope.radius + scope.glowSize,
+                        opacity: 0.8,
+                        fill: true
+                    });
+            } else {
+                if (scope.circleElement.theGlow) {
+                    scope.circleElement.theGlow.remove();
+                }
+
+                /*scope.circleElement.theGlow = scope.circleElement.glow(
+                 {
+                 color: scope.glowColor,
+                 width: scope.radius + scope.glowSize,
+                 opacity: 0.4,
+                 fill: true
+                 });*/
+
+                scope.circleElement.attr("fill", scope.colorOff);
+                scope.circleElement.attr("stroke", scope.colorOff);
+                scope.circleElement.attr("opacity", scope.offOpacity);
+            }
+        }
+
+        scope.update = function() {
+            scope.size = scope.size || 50;
+            scope.canvasSize = scope.size;
+            scope.radius = scope.canvasSize / 4;
+            scope.glowSize = scope.radius / 5;
+
+            var template = '<div id="canvas_container" style="width: ' + scope.size + 'px; height: ' + scope.size + 'px;"></div>';
+            element.html(template);
+            $compile(element.contents())(scope);
+            scope.paper = new Raphael($('#canvas_container', element)[0], scope.canvasSize, scope.canvasSize);
+            var center = scope.canvasSize / 2;
+            scope.circleElement = scope.paper.circle(center, center, scope.radius);
+            scope.draw();
+        }
+
+        scope.update();
+    }
+
+
+    return {
+        restrict: "E",
+        link: linker,
+        scope: {
+            size: '=?',
+            colorOn: '=',
+            colorOff: '=',
+            offOpacity: '=?',
+            //glowColor: '=',
+            tbEnabled: '='
+        }
+    };
+
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/menu-link.directive.js b/ui/src/app/components/menu-link.directive.js
new file mode 100644
index 0000000..a8f20ff
--- /dev/null
+++ b/ui/src/app/components/menu-link.directive.js
@@ -0,0 +1,76 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './menu-link.scss';
+
+import thingsboardMenu from '../services/menu.service';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import menulinkTemplate from './menu-link.tpl.html';
+import menutoggleTemplate from './menu-toggle.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.menuLink', [thingsboardMenu])
+    .directive('tbMenuLink', MenuLink)
+    .filter('nospace', NoSpace)
+    .name;
+
+/*@ngInject*/
+function MenuLink($compile, $templateCache, menu) {
+
+    var linker = function (scope, element) {
+        var template;
+
+        if (scope.section.type === 'link') {
+            template = $templateCache.get(menulinkTemplate);
+        } else {
+            template = $templateCache.get(menutoggleTemplate);
+
+            var parentNode = element[0].parentNode.parentNode.parentNode;
+            if (parentNode.classList.contains('parent-list-item')) {
+                var heading = parentNode.querySelector('h2');
+                element[0].firstChild.setAttribute('aria-describedby', heading.id);
+            }
+
+            scope.sectionActive = function () {
+                return menu.sectionActive(scope.section);
+            };
+
+            scope.sectionHeight = function () {
+                return menu.sectionHeight(scope.section);
+            };
+        }
+
+        element.html(template);
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        link: linker,
+        scope: {
+            section: '='
+        }
+    };
+}
+
+function NoSpace() {
+    return function (value) {
+        return (!value) ? '' : value.replace(/ /g, '');
+    }
+}

diff --git a/ui/src/app/components/menu-link.scss b/ui/src/app/components/menu-link.scss
new file mode 100644
index 0000000..5d04761
--- /dev/null
+++ b/ui/src/app/components/menu-link.scss
@@ -0,0 +1,32 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import "~compass-sass-mixins/lib/compass";
+
+.md-button-toggle .md-toggle-icon.tb-toggled {
+  @include transform(rotateZ(180deg));
+}
+
+.tb-menu-toggle-list.ng-hide {
+  max-height: 0;
+}
+
+.tb-menu-toggle-list {
+  overflow: hidden;
+  position: relative;
+  z-index: 1;
+  @include transition(0.75s cubic-bezier(0.35, 0, 0.25, 1));
+  @include transition-property(height);
+}

diff --git a/ui/src/app/components/menu-link.tpl.html b/ui/src/app/components/menu-link.tpl.html
new file mode 100644
index 0000000..48a93af
--- /dev/null
+++ b/ui/src/app/components/menu-link.tpl.html
@@ -0,0 +1,22 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-button 
+	ui-sref-active-eq="tb-active" ui-sref="{{section.state}}">
+	<md-icon ng-show="{{section.icon != null}}" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon>	
+	{{section.name | translate}}
+</md-button>
\ No newline at end of file

diff --git a/ui/src/app/components/menu-toggle.tpl.html b/ui/src/app/components/menu-toggle.tpl.html
new file mode 100644
index 0000000..3691521
--- /dev/null
+++ b/ui/src/app/components/menu-toggle.tpl.html
@@ -0,0 +1,33 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-button 
+	ui-sref-active-eq="tb-active" ui-sref="{{section.state}}"
+    class="md-button-toggle"
+	aria-controls="docs-menu-{{section.name | nospace}}" layout="row"
+	aria-expanded="{{sectionActive()}}">
+	<md-icon ng-show="{{section.icon != null}}" aria-label="{{section.icon}}" class="material-icons">{{section.icon}}</md-icon>	
+	{{section.name | translate}}
+	<span aria-hidden="true" 
+	class=" pull-right fa fa-chevron-down md-toggle-icon"
+	ng-class="{'tb-toggled' : sectionActive()}"></span>
+</md-button>
+<ul id="docs-menu-{{section.name | nospace}}" class="tb-menu-toggle-list" style="height: {{sectionHeight()}};">
+	<li ng-repeat="page in section.pages">
+     	<tb-menu-link section="page"></tb-menu-link>
+	</li>
+</ul>

diff --git a/ui/src/app/components/no-animate.directive.js b/ui/src/app/components/no-animate.directive.js
new file mode 100644
index 0000000..deceaa8
--- /dev/null
+++ b/ui/src/app/components/no-animate.directive.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import ngAnimate from 'angular-animate';
+
+export default angular.module('thingsboard.directives.noAnimate', [ngAnimate])
+    .directive('tbNoAnimate', NoAnimate)
+    .name;
+
+/*@ngInject*/
+function NoAnimate($animate) {
+    return {
+        restrict: 'A',
+        link: function (scope, element) {
+            $animate.enabled(element, false)
+            scope.$watch(function () {
+                $animate.enabled(element, false)
+            })
+        }
+    };
+}

diff --git a/ui/src/app/components/plugin-select.directive.js b/ui/src/app/components/plugin-select.directive.js
new file mode 100644
index 0000000..5ec14dd
--- /dev/null
+++ b/ui/src/app/components/plugin-select.directive.js
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './plugin-select.scss';
+
+import thingsboardApiPlugin from '../api/plugin.service';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import pluginSelectTemplate from './plugin-select.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+
+export default angular.module('thingsboard.directives.pluginSelect', [thingsboardApiPlugin])
+    .directive('tbPluginSelect', PluginSelect)
+    .name;
+
+/*@ngInject*/
+function PluginSelect($compile, $templateCache, $q, pluginService, types) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var template = $templateCache.get(pluginSelectTemplate);
+        element.html(template);
+
+        scope.tbRequired = angular.isDefined(scope.tbRequired) ? scope.tbRequired : false;
+        scope.plugin = null;
+        scope.pluginSearchText = '';
+        scope.searchTextChanged = false;
+
+        scope.pluginFetchFunction = pluginService.getAllPlugins;
+        if (angular.isDefined(scope.pluginsScope)) {
+            if (scope.pluginsScope === 'action') {
+                scope.pluginFetchFunction = pluginService.getAllActionPlugins;
+            } else if (scope.pluginsScope === 'system') {
+                scope.pluginFetchFunction = pluginService.getSystemPlugins;
+            } else if (scope.pluginsScope === 'tenant') {
+                scope.pluginFetchFunction = pluginService.getTenantPlugins;
+            }
+        }
+
+        scope.fetchPlugins = function(searchText) {
+            var pageLink = {limit: 10, textSearch: searchText};
+
+            var deferred = $q.defer();
+
+            scope.pluginFetchFunction(pageLink).then(function success(result) {
+                deferred.resolve(result.data);
+            }, function fail() {
+                deferred.reject();
+            });
+
+            return deferred.promise;
+        }
+
+        scope.pluginSearchTextChanged = function() {
+            scope.searchTextChanged = true;
+        }
+
+        scope.isSystem = function(item) {
+            return item && item.tenantId.id === types.id.nullUid;
+        }
+
+        scope.updateView = function () {
+            ngModelCtrl.$setViewValue(scope.plugin);
+        }
+
+        ngModelCtrl.$render = function () {
+            if (ngModelCtrl.$viewValue) {
+                scope.plugin = ngModelCtrl.$viewValue;
+            }
+        }
+
+        scope.$watch('plugin', function () {
+            scope.updateView();
+        })
+
+        if (scope.selectFirstPlugin) {
+            var pageLink = {limit: 1, textSearch: ''};
+            scope.pluginFetchFunction(pageLink).then(function success(result) {
+                var plugins = result.data;
+                if (plugins.length > 0) {
+                    scope.plugin = plugins[0];
+                }
+            }, function fail() {
+            });
+        }
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        link: linker,
+        scope: {
+            pluginsScope: '@',
+            theForm: '=?',
+            tbRequired: '=?',
+            selectFirstPlugin: '='
+        }
+    };
+}

diff --git a/ui/src/app/components/plugin-select.scss b/ui/src/app/components/plugin-select.scss
new file mode 100644
index 0000000..6adcc82
--- /dev/null
+++ b/ui/src/app/components/plugin-select.scss
@@ -0,0 +1,37 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import "../../scss/mixins";
+
+.tb-plugin-autocomplete {
+  .tb-not-found {
+    display: block;
+    line-height: 1.5;
+    height: 48px;
+  }
+  .tb-plugin-item {
+    display: block;
+    height: 48px;
+    .tb-plugin-system {
+      font-size: 0.8rem;
+      opacity: 0.8;
+      float: right;
+    }
+  }
+  li {
+    height: auto !important;
+    white-space: normal !important;
+  }
+}

diff --git a/ui/src/app/components/plugin-select.tpl.html b/ui/src/app/components/plugin-select.tpl.html
new file mode 100644
index 0000000..2beb2f6
--- /dev/null
+++ b/ui/src/app/components/plugin-select.tpl.html
@@ -0,0 +1,44 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-autocomplete ng-required="tbRequired"
+                 md-input-name="plugin"
+                 ng-model="plugin"
+                 md-selected-item="plugin"
+                 md-search-text="pluginSearchText"
+                 md-search-text-change="pluginSearchTextChanged()"
+                 md-items="item in fetchPlugins(pluginSearchText)"
+                 md-item-text="item.name"
+                 md-min-length="0"
+                 placeholder="{{ 'plugin.select-plugin' | translate }}"
+                 md-menu-class="tb-plugin-autocomplete">
+    <md-item-template>
+        <div class="tb-plugin-item">
+            <span md-highlight-text="pluginSearchText" md-highlight-flags="^i">{{item.name}}</span>
+            <span translate class="tb-plugin-system" ng-if="isSystem(item)">plugin.system</span>
+        </div>
+    </md-item-template>
+    <md-not-found>
+        <div class="tb-not-found">
+            <span translate translate-values='{ plugin: pluginSearchText }'>plugin.no-plugins-matching</span>
+        </div>
+    </md-not-found>
+</md-autocomplete>
+<div ng-if="searchTextChanged" class="tb-error-messages" ng-messages="theForm.plugin.$error" role="alert">
+    <div translate ng-message="required" class="tb-error-message">plugin.plugin-required</div>
+    <div translate ng-message="md-require-match" class="tb-error-message">plugin.plugin-require-match</div>
+</div>

diff --git a/ui/src/app/components/react/json-form.scss b/ui/src/app/components/react/json-form.scss
new file mode 100644
index 0000000..889eca5
--- /dev/null
+++ b/ui/src/app/components/react/json-form.scss
@@ -0,0 +1,101 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import "~compass-sass-mixins/lib/compass";
+
+$swift-ease-out-duration: 0.4s !default;
+$swift-ease-out-timing-function: cubic-bezier(0.25, 0.8, 0.25, 1) !default;
+
+$input-label-float-offset: 6px !default;
+$input-label-float-scale: 0.75 !default;
+
+.json-form-error {
+    position: relative;
+    bottom: -5px;
+    font-size: 12px;
+    line-height: 12px;
+    color: rgb(244, 67, 54);
+    @include transition(all 450ms cubic-bezier(0.23, 1, 0.32, 1) 0ms);
+}
+
+.tb-container {
+    position: relative;
+    margin-top: 32px;
+    padding: 10px 0;
+}
+
+.tb-field {
+    &.tb-required {
+        label:after {
+            content: ' *';
+            font-size: 13px;
+            vertical-align: top;
+            color: rgba(0,0,0,0.54);
+        }
+    }
+    &.tb-focused:not(.tb-readonly) {
+        label:after {
+            color: rgb(221,44,0);
+        }
+    }
+}
+
+.tb-date-field {
+    &.tb-required {
+        div>div:first-child:after {
+            content: ' *';
+            font-size: 13px;
+            vertical-align: top;
+            color: rgba(0,0,0,0.54);
+        }
+    }
+    &.tb-focused:not(.tb-readonly) {
+        div>div:first-child:after {
+            color: rgb(221,44,0);
+        }
+    }
+}
+
+label.tb-label {
+    color: rgba(0,0,0,0.54);
+    -webkit-font-smoothing: antialiased;
+    position: absolute;
+    bottom: 100%;
+    left: 0;
+    right: auto;
+    @include transform(translate3d(0, $input-label-float-offset, 0) scale($input-label-float-scale));
+    @include transition(transform $swift-ease-out-timing-function $swift-ease-out-duration,
+                          width $swift-ease-out-timing-function $swift-ease-out-duration);
+    transform-origin: left top;
+
+    &.tb-focused {
+        color: rgb(96,125,139);
+    }
+
+    &.tb-required:after {
+        content: ' *';
+        font-size: 13px;
+        vertical-align: top;
+        color: rgba(0,0,0,0.54);
+    }
+
+    &.tb-focused:not(.tb-readonly):after {
+        color: rgb(221,44,0);
+    }
+}
+
+.tb-head-label {
+    color: rgba(0,0,0,0.54);
+}

diff --git a/ui/src/app/components/react/json-form-ace-editor.jsx b/ui/src/app/components/react/json-form-ace-editor.jsx
new file mode 100644
index 0000000..0bfc77f
--- /dev/null
+++ b/ui/src/app/components/react/json-form-ace-editor.jsx
@@ -0,0 +1,136 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './json-form-ace-editor.scss';
+
+import React from 'react';
+import ThingsboardBaseComponent from './json-form-base-component.jsx';
+import reactCSS from 'reactcss';
+import AceEditor from 'react-ace';
+import FlatButton from 'material-ui/FlatButton';
+import 'brace/ext/language_tools';
+import 'brace/theme/github';
+
+class ThingsboardAceEditor extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onValueChanged = this.onValueChanged.bind(this);
+        this.onBlur = this.onBlur.bind(this);
+        this.onFocus = this.onFocus.bind(this);
+        this.onTidy = this.onTidy.bind(this);
+        var value = props.value ? props.value + '' : '';
+        this.state = {
+            value: value,
+            focused: false
+        };
+    }
+
+    onValueChanged(value) {
+        this.setState({
+            value: value
+        });
+        this.props.onChangeValidate({
+            target: {
+                value: value
+            }
+        });
+    }
+
+    onBlur() {
+        this.setState({ focused: false })
+    }
+
+    onFocus() {
+        this.setState({ focused: true })
+    }
+
+    onTidy() {
+        if (!this.props.form.readonly) {
+            var value = this.state.value;
+            value = this.props.onTidy(value);
+            this.setState({
+                value: value
+            })
+            this.props.onChangeValidate({
+                target: {
+                    value: value
+                }
+            });
+        }
+    }
+
+    render() {
+
+        const styles = reactCSS({
+            'default': {
+                tidyButtonStyle: {
+                    color: '#7B7B7B',
+                    minWidth: '32px',
+                    minHeight: '15px',
+                    lineHeight: '15px',
+                    fontSize: '0.800rem',
+                    margin: '0',
+                    padding: '4px',
+                    height: '23px',
+                    borderRadius: '5px',
+                    marginLeft: '5px'
+                }
+            }
+        });
+
+        var labelClass = "tb-label";
+        if (this.props.form.required) {
+            labelClass += " tb-required";
+        }
+        if (this.props.form.readonly) {
+            labelClass += " tb-readonly";
+        }
+        if (this.state.focused) {
+            labelClass += " tb-focused";
+        }
+
+        return (
+            <div className="tb-container">
+                <label className={labelClass}>{this.props.form.title}</label>
+                <div className="json-form-ace-editor">
+                    <div className="title-panel">
+                        <label>{this.props.mode}</label>
+                        <FlatButton style={ styles.tidyButtonStyle } className="tidy-button" label={'Tidy'} onTouchTap={this.onTidy}/>
+                    </div>
+                    <AceEditor mode={this.props.mode}
+                               height="150px"
+                               width="300px"
+                               theme="github"
+                               onChange={this.onValueChanged}
+                               onFocus={this.onFocus}
+                               onBlur={this.onBlur}
+                               name={this.props.form.title}
+                               value={this.state.value}
+                               readOnly={this.props.form.readonly}
+                               editorProps={{$blockScrolling: true}}
+                               enableBasicAutocompletion={true}
+                               enableSnippets={true}
+                               enableLiveAutocompletion={true}
+                               style={this.props.form.style || {width: '100%'}}/>
+                </div>
+                <div className="json-form-error"
+                    style={{opacity: this.props.valid ? '0' : '1'}}>{this.props.error}</div>
+            </div>
+        );
+    }
+}
+
+export default ThingsboardBaseComponent(ThingsboardAceEditor);

diff --git a/ui/src/app/components/react/json-form-ace-editor.scss b/ui/src/app/components/react/json-form-ace-editor.scss
new file mode 100644
index 0000000..8ee48a3
--- /dev/null
+++ b/ui/src/app/components/react/json-form-ace-editor.scss
@@ -0,0 +1,42 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.json-form-ace-editor {
+    position: relative;
+    border: 1px solid #C0C0C0;
+    height: 100%;
+    .title-panel {
+        position: absolute;
+        font-size: 0.800rem;
+        font-weight: 500;
+        top: 10px;
+        right: 20px;
+        z-index: 5;
+        label {
+          color: #00acc1;
+          background: rgba(220, 220, 220, 0.35);
+          border-radius: 5px;
+          padding: 4px;
+          text-transform: uppercase;
+        }
+        button.tidy-button {
+          background: rgba(220, 220, 220, 0.35) !important;
+          span {
+             padding: 0px !important;
+             font-size: 12px !important;
+          }
+        }
+    }
+}
\ No newline at end of file

diff --git a/ui/src/app/components/react/json-form-array.jsx b/ui/src/app/components/react/json-form-array.jsx
new file mode 100644
index 0000000..6b380ef
--- /dev/null
+++ b/ui/src/app/components/react/json-form-array.jsx
@@ -0,0 +1,165 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { utils } from 'react-schema-form';
+import ThingsboardBaseComponent from './json-form-base-component.jsx';
+import RaisedButton from 'material-ui/RaisedButton';
+import FontIcon from 'material-ui/FontIcon';
+import _ from 'lodash';
+import IconButton from 'material-ui/IconButton';
+
+class ThingsboardArray extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onAppend = this.onAppend.bind(this);
+        this.onDelete = this.onDelete.bind(this);
+        var model = utils.selectOrSet(this.props.form.key, this.props.model) || [];
+        var keys = [];
+        for (var i=0;i<model.length;i++) {
+            keys.push(i);
+        }
+        this.state = {
+            model:  model,
+            keys: keys
+        };
+    }
+
+    componentDidMount() {
+        if(this.props.form.startEmpty !== true && this.state.model.length === 0) {
+            this.onAppend();
+        }
+    }
+
+    onAppend() {
+        var empty;
+        if(this.props.form && this.props.form.schema && this.props.form.schema.items) {
+            var items = this.props.form.schema.items;
+            if (items.type && items.type.indexOf('object') !== -1) {
+                empty = {};
+                if (!this.props.options || this.props.options.setSchemaDefaults !== false) {
+                    empty = typeof items['default'] !== 'undefined' ? items['default'] : empty;
+                    if (empty) {
+                        utils.traverseSchema(items, function(prop, path) {
+                            if (typeof prop['default'] !== 'undefined') {
+                                utils.selectOrSet(path, empty, prop['default']);
+                            }
+                        });
+                    }
+                }
+
+            } else if (items.type && items.type.indexOf('array') !== -1) {
+                empty = [];
+                if (!this.props.options || this.props.options.setSchemaDefaults !== false) {
+                    empty = items['default'] || empty;
+                }
+            } else {
+                if (!this.props.options || this.props.options.setSchemaDefaults !== false) {
+                    empty = items['default'] || empty;
+                }
+            }
+        }
+        var newModel = this.state.model;
+        newModel.push(empty);
+        var newKeys = this.state.keys;
+        var key = 0;
+        if (newKeys.length > 0) {
+            key = newKeys[newKeys.length-1]+1;
+        }
+        newKeys.push(key);
+        this.setState({
+                model: newModel,
+                keys: newKeys
+            }
+        );
+        this.props.onChangeValidate(this.state.model);
+    }
+
+    onDelete(index) {
+        var newModel = this.state.model;
+        newModel.splice(index, 1);
+        var newKeys = this.state.keys;
+        newKeys.splice(index, 1);
+        this.setState(
+            {
+                model: newModel,
+                keys: newKeys
+            }
+        );
+        this.props.onChangeValidate(this.state.model);
+    }
+
+    setIndex(index) {
+        return function(form) {
+            if (form.key) {
+                form.key[form.key.indexOf('')] = index;
+            }
+        };
+    };
+
+    copyWithIndex(form, index) {
+        var copy = _.cloneDeep(form);
+        copy.arrayIndex = index;
+        utils.traverseForm(copy, this.setIndex(index));
+        return copy;
+    };
+
+    render() {
+        var arrays = [];
+        var fields = [];
+        var model = this.state.model;
+        var keys = this.state.keys;
+        var items = this.props.form.items;
+        for(var i = 0; i < model.length; i++ ) {
+            let removeButton = '';
+            if (!this.props.form.readonly) {
+                let boundOnDelete = this.onDelete.bind(this, i)
+                removeButton = <IconButton iconClassName="material-icons" tooltip="Remove" onTouchTap={boundOnDelete}>clear</IconButton>
+            }
+            let forms = this.props.form.items.map(function(form, index){
+                var copy = this.copyWithIndex(form, i);
+                return this.props.builder(copy, this.props.model, index, this.props.onChange, this.props.onColorClick, this.props.mapper, this.props.builder);
+            }.bind(this));
+            arrays.push(
+            <li key={keys[i]} className="list-group-item">
+                {removeButton}
+                {forms}
+                </li>
+        );
+        }
+        let addButton = '';
+        if (!this.props.form.readonly) {
+            addButton = <RaisedButton label={this.props.form.add || 'New'}
+                                    primary={true}
+                                    icon={<FontIcon className="material-icons">add</FontIcon>}
+                                    onTouchTap={this.onAppend}></RaisedButton>;
+        }
+
+        return (
+            <div>
+                <div className="tb-container">
+                    <div className="tb-head-label">{this.props.form.title}</div>
+                        <ol className="list-group">
+                            {arrays}
+                        </ol>
+                </div>
+                {addButton}
+            </div>
+        );
+    }
+}
+
+export default ThingsboardBaseComponent(ThingsboardArray);

diff --git a/ui/src/app/components/react/json-form-base-component.jsx b/ui/src/app/components/react/json-form-base-component.jsx
new file mode 100644
index 0000000..8afbe68
--- /dev/null
+++ b/ui/src/app/components/react/json-form-base-component.jsx
@@ -0,0 +1,117 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { utils } from 'react-schema-form';
+
+export default ThingsboardBaseComponent => class extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onChangeValidate = this.onChangeValidate.bind(this);
+        let value = this.defaultValue();
+        let validationResult = utils.validate(this.props.form, value);
+        this.state = {
+            value: value,
+            valid: !!(validationResult.valid || !value),
+            error: !validationResult.valid && value ? validationResult.error.message : null
+        };
+    }
+
+    componentDidMount() {
+        if (typeof this.state.value !== 'undefined') {
+            this.props.onChange(this.props.form.key, this.state.value);
+        }
+    }
+
+    onChangeValidate(e) {
+        let value = null;
+        if (this.props.form.schema.type === 'integer' || this.props.form.schema.type === 'number') {
+            if (e.target.value === null || e.target.value === '') {
+                value = undefined;
+            } else if (e.target.value.indexOf('.') == -1) {
+                value = parseInt(e.target.value);
+            } else {
+                value = parseFloat(e.target.value);
+            }
+        } else if(this.props.form.schema.type === 'boolean') {
+            value = e.target.checked;
+        } else if(this.props.form.schema.type === 'date' || this.props.form.schema.type === 'array') {
+            value = e;
+        } else { // string
+            value = e.target.value;
+        }
+        let validationResult = utils.validate(this.props.form, value);
+        this.setState({
+            value: value,
+            valid: validationResult.valid,
+            error: validationResult.valid ? null : validationResult.error.message
+        });
+        this.props.onChange(this.props.form.key, value);
+    }
+
+    defaultValue() {
+        let value = utils.selectOrSet(this.props.form.key, this.props.model);
+        if (this.props.form.schema.type === 'boolean') {
+            if (typeof value !== 'boolean' && this.props.form['default']) {
+                value = this.props.form['default'];
+            }
+            if (typeof value !== 'boolean' && this.props.form.schema && this.props.form.schema['default']) {
+                value = this.props.form.schema['default'];
+            }
+            if (typeof value !== 'boolean' &&
+                this.props.form.schema &&
+                this.props.form.required) {
+                value = false;
+            }
+        } else if (this.props.form.schema.type === 'integer' || this.props.form.schema.type === 'number') {
+            if (typeof value !== 'number' && this.props.form['default']) {
+                value = this.props.form['default'];
+            }
+            if (typeof value !== 'number' && this.props.form.schema && this.props.form.schema['default']) {
+                value = this.props.form.schema['default'];
+            }
+            if (typeof value !== 'number' && this.props.form.titleMap && this.props.form.titleMap[0].value) {
+                value = this.props.form.titleMap[0].value;
+            }
+            if (value && typeof value === 'string') {
+                if (value.indexOf('.') == -1) {
+                    value = parseInt(value);
+                } else {
+                    value = parseFloat(value);
+                }
+            }
+        } else {
+            if(!value && this.props.form['default']) {
+                value = this.props.form['default'];
+            }
+            if(!value && this.props.form.schema && this.props.form.schema['default']) {
+                value = this.props.form.schema['default'];
+            }
+            if(!value && this.props.form.titleMap && this.props.form.titleMap[0].value) {
+                value = this.props.form.titleMap[0].value;
+            }
+        }
+        return value;
+    }
+
+    render() {
+        if (this.props.form && this.props.form.schema) {
+            return <ThingsboardBaseComponent {...this.props} {...this.state} onChangeValidate={this.onChangeValidate}/>;
+        } else {
+            return <div></div>;
+        }
+    }
+};

diff --git a/ui/src/app/components/react/json-form-checkbox.jsx b/ui/src/app/components/react/json-form-checkbox.jsx
new file mode 100644
index 0000000..748b0a2
--- /dev/null
+++ b/ui/src/app/components/react/json-form-checkbox.jsx
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import ThingsboardBaseComponent from './json-form-base-component.jsx';
+import Checkbox from 'material-ui/Checkbox';
+
+class ThingsboardCheckbox extends React.Component {
+    render() {
+        return (
+            <Checkbox
+                name={this.props.form.key.slice(-1)[0]}
+                value={this.props.form.key.slice(-1)[0]}
+                defaultChecked={this.props.value || false}
+                label={this.props.form.title}
+                disabled={this.props.form.readonly}
+                onCheck={(e, checked) => {this.props.onChangeValidate(e)}}
+                style={{paddingTop: '20px'}}
+            />
+        );
+    }
+}
+
+export default ThingsboardBaseComponent(ThingsboardCheckbox);
\ No newline at end of file

diff --git a/ui/src/app/components/react/json-form-color.jsx b/ui/src/app/components/react/json-form-color.jsx
new file mode 100644
index 0000000..7980a54
--- /dev/null
+++ b/ui/src/app/components/react/json-form-color.jsx
@@ -0,0 +1,161 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './json-form-color.scss';
+
+import $ from 'jquery';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import ThingsboardBaseComponent from './json-form-base-component.jsx';
+import reactCSS from 'reactcss';
+import tinycolor from 'tinycolor2';
+import TextField from 'material-ui/TextField';
+import IconButton from 'material-ui/IconButton';
+
+class ThingsboardColor extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onValueChanged = this.onValueChanged.bind(this);
+        this.onSwatchClick = this.onSwatchClick.bind(this);
+        this.onClear = this.onClear.bind(this);
+        var value = props.value ? props.value + '' : null;
+        var color = value != null ? tinycolor(value).toRgb() : null;
+        this.state = {
+            color: color
+        };
+    }
+
+    componentDidMount() {
+        var node = ReactDOM.findDOMNode(this);
+        var colContainer = $(node).children('#color-container');
+        colContainer.click(this, function(event) {
+            if (!event.data.props.form.readonly) {
+                event.data.onSwatchClick(event);
+            }
+        });
+    }
+
+    componentWillUnmount () {
+        var node = ReactDOM.findDOMNode(this);
+        var colContainer = $(node).children('#color-container');
+        colContainer.off( "click" );
+    }
+
+    onValueChanged(value) {
+        var color = null;
+        if (value != null) {
+            color = tinycolor(value);
+        }
+        this.setState({
+            color: value
+        })
+        var colorValue = '';
+        if (color != null && color.getAlpha() != 1) {
+            colorValue = color.toRgbString();
+        } else if (color != null) {
+            colorValue = color.toHexString();
+        }
+        this.props.onChangeValidate({
+            target: {
+                value: colorValue
+            }
+        });
+    }
+
+    onSwatchClick(event) {
+        this.props.onColorClick(event, this.props.form.key, this.state.color);
+    }
+
+    onClear(event) {
+        if (event) {
+            event.stopPropagation();
+        }
+        this.onValueChanged(null);
+    }
+
+    render() {
+
+        var background = 'rgba(0,0,0,0)';
+        if (this.state.color != null) {
+            background = `rgba(${ this.state.color.r }, ${ this.state.color.g }, ${ this.state.color.b }, ${ this.state.color.a })`;
+        }
+
+        const styles = reactCSS({
+            'default': {
+                color: {
+                    background: `${ background }`
+                },
+                swatch: {
+                    display: 'inline-block',
+                    marginRight: '10px',
+                    marginTop: 'auto',
+                    marginBottom: 'auto',
+                    cursor: 'pointer',
+                    opacity: `${ this.props.form.readonly ? '0.6' : '1' }`
+                },
+                swatchText: {
+                    display: 'inline-block',
+                    width: '100%'
+                },
+                container: {
+                    display: 'flex'
+                },
+                colorContainer: {
+                    display: 'flex',
+                    width: '100%'
+                }
+            },
+        });
+
+        var fieldClass = "tb-field";
+        if (this.props.form.required) {
+            fieldClass += " tb-required";
+        }
+        if (this.props.form.readonly) {
+            fieldClass += " tb-readonly";
+        }
+        if (this.state.focused) {
+            fieldClass += " tb-focused";
+        }
+
+        var stringColor = '';
+        if (this.state.color != null) {
+            var color = tinycolor(this.state.color);
+            stringColor = color.toRgbString();
+        }
+
+        return (
+            <div style={ styles.container }>
+                 <div id="color-container" style={ styles.colorContainer }>
+                    <div className="tb-color-preview" style={ styles.swatch }>
+                        <div className="tb-color-result" style={ styles.color }/>
+                    </div>
+                    <TextField
+                        className={fieldClass}
+                        floatingLabelText={this.props.form.title}
+                        hintText={this.props.form.placeholder}
+                        errorText={this.props.error}
+                        value={stringColor}
+                        disabled={this.props.form.readonly}
+                        style={ styles.swatchText } />
+                 </div>
+                <IconButton iconClassName="material-icons" tooltip="Clear" onTouchTap={this.onClear}>clear</IconButton>
+            </div>
+        );
+    }
+}
+
+export default ThingsboardBaseComponent(ThingsboardColor);

diff --git a/ui/src/app/components/react/json-form-color.scss b/ui/src/app/components/react/json-form-color.scss
new file mode 100644
index 0000000..60af66f
--- /dev/null
+++ b/ui/src/app/components/react/json-form-color.scss
@@ -0,0 +1,39 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@mixin tb-checkered-bg() {
+  background-color: #fff;
+  background-image: linear-gradient(45deg, #ddd 25%, transparent 25%, transparent 75%, #ddd 75%, #ddd),
+  linear-gradient(45deg, #ddd 25%, transparent 25%, transparent 75%, #ddd 75%, #ddd);
+  background-size: 8px 8px;
+  background-position: 0 0, 4px 4px;
+}
+
+.tb-color-preview {
+  content: '';
+  width: 24px;
+  height: 24px;
+  border: 2px solid #fff;
+  border-radius: 50%;
+  box-shadow: 0 3px 1px -2px rgba(0, 0, 0, .14), 0 2px 2px 0 rgba(0, 0, 0, .098), 0 1px 5px 0 rgba(0, 0, 0, .084);
+  position: relative;
+  overflow: hidden;
+  @include tb-checkered-bg();
+
+  .tb-color-result {
+    width: 100%;
+    height: 100%;
+  }
+}

diff --git a/ui/src/app/components/react/json-form-date.jsx b/ui/src/app/components/react/json-form-date.jsx
new file mode 100644
index 0000000..ff8fc70
--- /dev/null
+++ b/ui/src/app/components/react/json-form-date.jsx
@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import ThingsboardBaseComponent from './json-form-base-component.jsx';
+import DatePicker from 'material-ui/DatePicker/DatePicker';
+
+class ThingsboardDate extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onDatePicked = this.onDatePicked.bind(this);
+    }
+
+
+    onDatePicked(empty, date) {
+        this.props.onChangeValidate(date);
+    }
+
+    render() {
+
+        var fieldClass = "tb-date-field";
+        if (this.props.form.required) {
+            fieldClass += " tb-required";
+        }
+        if (this.props.form.readonly) {
+            fieldClass += " tb-readonly";
+        }
+
+        return (
+            <div style={{width: '100%', display: 'block'}}>
+                <DatePicker
+                    className={fieldClass}
+                    mode={'landscape'}
+                    autoOk={true}
+                    hintText={this.props.form.title}
+                    onChange={this.onDatePicked}
+                    onShow={null}
+                    onDismiss={null}
+                    disabled={this.props.form.readonly}
+                    style={this.props.form.style || {width: '100%'}}/>
+
+            </div>
+        );
+    }
+}
+
+export default ThingsboardBaseComponent(ThingsboardDate);
\ No newline at end of file

diff --git a/ui/src/app/components/react/json-form-fieldset.jsx b/ui/src/app/components/react/json-form-fieldset.jsx
new file mode 100644
index 0000000..c12098c
--- /dev/null
+++ b/ui/src/app/components/react/json-form-fieldset.jsx
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+
+class ThingsboardFieldSet extends React.Component {
+
+    render() {
+        let forms = this.props.form.items.map(function(form, index){
+            return this.props.builder(form, this.props.model, index, this.props.onChange, this.props.onColorClick, this.props.mapper, this.props.builder);
+        }.bind(this));
+
+        return (
+            <div style={{paddingTop: '20px'}}>
+                <div className="tb-head-label">
+                    {this.props.form.title}
+                </div>
+                <div>
+                    {forms}
+                </div>
+            </div>
+        );
+    }
+}
+
+export default ThingsboardFieldSet;

diff --git a/ui/src/app/components/react/json-form-javascript.jsx b/ui/src/app/components/react/json-form-javascript.jsx
new file mode 100644
index 0000000..b808fc6
--- /dev/null
+++ b/ui/src/app/components/react/json-form-javascript.jsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import ThingsboardAceEditor from './json-form-ace-editor.jsx';
+import 'brace/mode/javascript';
+import beautify from 'js-beautify';
+
+const js_beautify = beautify.js;
+
+class ThingsboardJavaScript extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onTidyJavascript = this.onTidyJavascript.bind(this);
+    }
+
+    onTidyJavascript(javascript) {
+        return js_beautify(javascript, {indent_size: 4, wrap_line_length: 60});
+    }
+
+    render() {
+        return (
+                <ThingsboardAceEditor {...this.props} mode='javascript' onTidy={this.onTidyJavascript} {...this.state}></ThingsboardAceEditor>
+            );
+    }
+}
+
+export default ThingsboardJavaScript;

diff --git a/ui/src/app/components/react/json-form-json.jsx b/ui/src/app/components/react/json-form-json.jsx
new file mode 100644
index 0000000..91be72e
--- /dev/null
+++ b/ui/src/app/components/react/json-form-json.jsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import ThingsboardAceEditor from './json-form-ace-editor.jsx';
+import 'brace/mode/json';
+import beautify from 'js-beautify';
+
+const js_beautify = beautify.js;
+
+class ThingsboardJson extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onTidyJson = this.onTidyJson.bind(this);
+    }
+
+    onTidyJson(json) {
+        return js_beautify(json, {indent_size: 4});
+    }
+
+    render() {
+        return (
+            <ThingsboardAceEditor {...this.props} mode='json' onTidy={this.onTidyJson} {...this.state}></ThingsboardAceEditor>
+        );
+    }
+}
+
+export default ThingsboardJson;

diff --git a/ui/src/app/components/react/json-form-number.jsx b/ui/src/app/components/react/json-form-number.jsx
new file mode 100644
index 0000000..1922ca2
--- /dev/null
+++ b/ui/src/app/components/react/json-form-number.jsx
@@ -0,0 +1,85 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import ThingsboardBaseComponent from './json-form-base-component.jsx';
+import TextField from 'material-ui/TextField';
+
+class ThingsboardNumber extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.preValidationCheck = this.preValidationCheck.bind(this);
+        this.onBlur = this.onBlur.bind(this);
+        this.onFocus = this.onFocus.bind(this);
+        this.state = {
+            lastSuccessfulValue : this.props.value,
+            focused: false
+        }
+    }
+
+    isNumeric(n) {
+        return n === null || n === '' || !isNaN(n) && isFinite(n);
+    }
+
+    onBlur() {
+        this.setState({ focused: false })
+    }
+
+    onFocus() {
+        this.setState({ focused: true })
+    }
+
+    preValidationCheck(e) {
+        if (this.isNumeric(e.target.value)) {
+            this.setState({
+                lastSuccessfulValue: e.target.value
+            });
+            this.props.onChangeValidate(e);
+        }
+    }
+
+    render() {
+
+        var fieldClass = "tb-field";
+        if (this.props.form.required) {
+            fieldClass += " tb-required";
+        }
+        if (this.props.form.readonly) {
+            fieldClass += " tb-readonly";
+        }
+        if (this.state.focused) {
+            fieldClass += " tb-focused";
+        }
+
+        return (
+            <TextField
+                className={fieldClass}
+                type={this.props.form.type}
+                floatingLabelText={this.props.form.title}
+                hintText={this.props.form.placeholder}
+                errorText={this.props.error}
+                onChange={this.preValidationCheck}
+                defaultValue={this.state.lastSuccessfulValue}
+                ref="numberField"
+                disabled={this.props.form.readonly}
+                onFocus={this.onFocus}
+                onBlur={this.onBlur}
+                style={this.props.form.style || {width: '100%'}}/>
+        );
+    }
+}
+
+export default ThingsboardBaseComponent(ThingsboardNumber);
\ No newline at end of file

diff --git a/ui/src/app/components/react/json-form-rc-select.jsx b/ui/src/app/components/react/json-form-rc-select.jsx
new file mode 100644
index 0000000..d9eb09f
--- /dev/null
+++ b/ui/src/app/components/react/json-form-rc-select.jsx
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import 'rc-select/assets/index.css';
+
+import React from 'react';
+import ThingsboardBaseComponent from './json-form-base-component.jsx';
+import Select, {Option} from 'rc-select';
+
+class ThingsboardRcSelect extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onSelect = this.onSelect.bind(this);
+        this.onDeselect = this.onDeselect.bind(this);
+        this.onBlur = this.onBlur.bind(this);
+        this.onFocus = this.onFocus.bind(this);
+        let emptyValue = this.props.form.schema.type === 'array'? [] : null;
+        this.state = {
+            currentValue: this.props.value || emptyValue,
+            items: this.props.form.items,
+            focused: false
+        };
+    }
+
+    onSelect(value, option) {
+        if(this.props.form.schema.type === 'array') {
+            let v = this.state.currentValue;
+            v.push(value);
+            this.setState({
+                currentValue: v
+            });
+            this.props.onChangeValidate(v);
+        } else {
+            this.setState({currentValue: value});
+            this.props.onChangeValidate({target: {value: value}});
+        }
+    }
+
+    onDeselect(value, option) {
+        if (this.props.form.schema.type === 'array') {
+            let v = this.state.currentValue;
+            let index = v.indexOf(value);
+            if (index > -1) {
+                v.splice(index, 1);
+            }
+            this.setState({
+                currentValue: v
+            });
+            this.props.onChangeValidate(v);
+        }
+    }
+
+    onBlur() {
+        this.setState({ focused: false })
+    }
+
+    onFocus() {
+        this.setState({ focused: true })
+    }
+
+    render() {
+        let options = [];
+        if(this.state.items && this.state.items.length > 0) {
+            options = this.state.items.map((item, idx) => (
+                <Option key={idx} value={item.value}>{item.label}</Option>
+            ));
+        }
+
+        var labelClass = "tb-label";
+        if (this.props.form.required) {
+            labelClass += " tb-required";
+        }
+        if (this.props.form.readonly) {
+            labelClass += " tb-readonly";
+        }
+        if (this.state.focused) {
+            labelClass += " tb-focused";
+        }
+
+        return (
+            <div className="tb-container">
+                <label className={labelClass}>{this.props.form.title}</label>
+                <Select
+                    className={this.props.form.className}
+                    dropdownClassName={this.props.form.dropdownClassName}
+                    dropdownStyle={this.props.form.dropdownStyle}
+                    dropdownMenuStyle={this.props.form.dropdownMenuStyle}
+                    allowClear={this.props.form.allowClear}
+                    tags={this.props.form.tags}
+                    maxTagTextLength={this.props.form.maxTagTextLength}
+                    multiple={this.props.form.multiple}
+                    combobox={this.props.form.combobox}
+                    disabled={this.props.form.readonly}
+                    value={this.state.currentValue}
+                    onSelect={this.onSelect}
+                    onDeselect={this.onDeselect}
+                    onFocus={this.onFocus}
+                    onBlur={this.onBlur}
+                    style={this.props.form.style || {width: "100%"}}>
+                    {options}
+                </Select>
+                <div className="json-form-error"
+                     style={{opacity: this.props.valid ? '0' : '1',
+                             bottom: '-5px'}}>{this.props.error}</div>
+            </div>
+        );
+    }
+}
+
+export default ThingsboardBaseComponent(ThingsboardRcSelect);

diff --git a/ui/src/app/components/react/json-form-react.jsx b/ui/src/app/components/react/json-form-react.jsx
new file mode 100644
index 0000000..fbccd8e
--- /dev/null
+++ b/ui/src/app/components/react/json-form-react.jsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './json-form.scss';
+
+import React from 'react';
+import getMuiTheme from 'material-ui/styles/getMuiTheme';
+import thingsboardTheme from './styles/thingsboardTheme';
+import ThingsboardSchemaForm from './json-form-schema-form.jsx';
+
+class ReactSchemaForm extends React.Component {
+
+    getChildContext() {
+        return {
+            muiTheme: this.state.muiTheme
+        };
+    }
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            muiTheme: getMuiTheme(thingsboardTheme)
+        };
+    }
+
+    render () {
+        if (this.props.form.length > 0) {
+            return <ThingsboardSchemaForm {...this.props} />;
+        } else {
+            return <div></div>;
+        }
+    }
+}
+
+ReactSchemaForm.propTypes = {
+        schema: React.PropTypes.object,
+        form: React.PropTypes.array,
+        model: React.PropTypes.object,
+        option: React.PropTypes.object,
+        onModelChange: React.PropTypes.func,
+        onColorClick: React.PropTypes.func
+}
+
+ReactSchemaForm.defaultProps = {
+    schema: {},
+    form: [ "*" ]
+}
+
+ReactSchemaForm.childContextTypes = {
+        muiTheme: React.PropTypes.object
+}
+
+export default ReactSchemaForm;

diff --git a/ui/src/app/components/react/json-form-schema-form.jsx b/ui/src/app/components/react/json-form-schema-form.jsx
new file mode 100644
index 0000000..3e1c046
--- /dev/null
+++ b/ui/src/app/components/react/json-form-schema-form.jsx
@@ -0,0 +1,99 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import React from 'react';
+import { utils } from 'react-schema-form';
+
+import ThingsboardArray from './json-form-array.jsx';
+import ThingsboardJavaScript from './json-form-javascript.jsx';
+import ThingsboardJson from './json-form-json.jsx';
+import ThingsboardColor from './json-form-color.jsx'
+import ThingsboardRcSelect from './json-form-rc-select.jsx';
+import ThingsboardNumber from './json-form-number.jsx';
+import ThingsboardText from './json-form-text.jsx';
+import Select from 'react-schema-form/lib/Select';
+import Radios from 'react-schema-form/lib/Radios';
+import ThingsboardDate from './json-form-date.jsx';
+import ThingsboardCheckbox from './json-form-checkbox.jsx';
+import Help from 'react-schema-form/lib/Help';
+import ThingsboardFieldSet from './json-form-fieldset.jsx';
+
+import _ from 'lodash';
+
+class ThingsboardSchemaForm extends React.Component {
+
+    constructor(props) {
+        super(props);
+
+        this.mapper = {
+            'number': ThingsboardNumber,
+            'text': ThingsboardText,
+            'password': ThingsboardText,
+            'textarea': ThingsboardText,
+            'select': Select,
+            'radios': Radios,
+            'date': ThingsboardDate,
+            'checkbox': ThingsboardCheckbox,
+            'help': Help,
+            'array': ThingsboardArray,
+            'javascript': ThingsboardJavaScript,
+            'json': ThingsboardJson,
+            'color': ThingsboardColor,
+            'rc-select': ThingsboardRcSelect,
+            'fieldset': ThingsboardFieldSet
+        };
+
+        this.onChange = this.onChange.bind(this);
+        this.onColorClick = this.onColorClick.bind(this);
+    }
+
+    onChange(key, val) {
+        //console.log('SchemaForm.onChange', key, val);
+        this.props.onModelChange(key, val);
+    }
+
+    onColorClick(event, key, val) {
+        this.props.onColorClick(event, key, val);
+    }
+
+    builder(form, model, index, onChange, onColorClick, mapper) {
+        var type = form.type;
+        let Field = this.mapper[type];
+        if(!Field) {
+            console.log('Invalid field: \"' + form.key[0] + '\"!');
+            return null;
+        }
+        if(form.condition && eval(form.condition) === false) {
+            return null;
+        }
+        return <Field model={model} form={form} key={index} onChange={onChange} onColorClick={onColorClick} mapper={mapper} builder={this.builder}/>
+    }
+
+    render() {
+        let merged = utils.merge(this.props.schema, this.props.form, this.props.ignore, this.props.option);
+        let mapper = this.mapper;
+        if(this.props.mapper) {
+            mapper = _.merge(this.mapper, this.props.mapper);
+        }
+        let forms = merged.map(function(form, index) {
+            return this.builder(form, this.props.model, index, this.onChange, this.onColorClick, mapper);
+        }.bind(this));
+
+        return (
+            <div style={{width: '100%'}} className='SchemaForm'>{forms}</div>
+        );
+    }
+}
+export default ThingsboardSchemaForm;

diff --git a/ui/src/app/components/react/json-form-text.jsx b/ui/src/app/components/react/json-form-text.jsx
new file mode 100644
index 0000000..6037dc2
--- /dev/null
+++ b/ui/src/app/components/react/json-form-text.jsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from 'react';
+import ThingsboardBaseComponent from './json-form-base-component.jsx';
+import TextField from 'material-ui/TextField';
+
+class ThingsboardText extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.onBlur = this.onBlur.bind(this);
+        this.onFocus = this.onFocus.bind(this);
+        this.state = {
+            focused: false
+        };
+    }
+
+    onBlur() {
+        this.setState({ focused: false })
+    }
+
+    onFocus() {
+        this.setState({ focused: true })
+    }
+
+    render() {
+
+        var fieldClass = "tb-field";
+        if (this.props.form.required) {
+            fieldClass += " tb-required";
+        }
+        if (this.props.form.readonly) {
+            fieldClass += " tb-readonly";
+        }
+        if (this.state.focused) {
+            fieldClass += " tb-focused";
+        }
+
+        var multiline = this.props.form.type === 'textarea';
+        var rows = multiline ? this.props.form.rows : 1;
+        var rowsMax = multiline ? this.props.form.rowsMax : 1;
+
+        return (
+            <div>
+                <TextField
+                    className={fieldClass}
+                    type={this.props.form.type}
+                    floatingLabelText={this.props.form.title}
+                    hintText={this.props.form.placeholder}
+                    errorText={this.props.error}
+                    onChange={this.props.onChangeValidate}
+                    defaultValue={this.props.value}
+                    disabled={this.props.form.readonly}
+                    multiLine={multiline}
+                    rows={rows}
+                    rowsMax={rowsMax}
+                    onFocus={this.onFocus}
+                    onBlur={this.onBlur}
+                    style={this.props.form.style || {width: '100%'}} />
+            </div>
+        );
+    }
+}
+
+export default ThingsboardBaseComponent(ThingsboardText);
\ No newline at end of file

diff --git a/ui/src/app/components/react/styles/thingsboardTheme.js b/ui/src/app/components/react/styles/thingsboardTheme.js
new file mode 100644
index 0000000..7ed06f4
--- /dev/null
+++ b/ui/src/app/components/react/styles/thingsboardTheme.js
@@ -0,0 +1,63 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { /*blueGrey500, blueGrey700, blueGrey100, orange500,*/
+         grey100, grey500, grey900, grey600, white, grey400, darkBlack, cyan500, fullBlack/*, indigo500*/, indigo700, indigo100, deepOrange500 } from 'material-ui/styles/colors';
+import {fade} from 'material-ui/utils/colorManipulator';
+import spacing from 'material-ui/styles/spacing';
+
+const PRIMARY_BACKGROUND_COLOR = "#305680";//"#3f51b5";
+
+/*var blueGrayPalette = {
+    primary1Color: blueGrey500,
+    primary2Color: blueGrey700,
+    primary3Color: blueGrey100,
+    accent1Color: orange500,
+    accent2Color: grey100,
+    accent3Color: grey500,
+    textColor: grey900,
+    secondaryTextColor: grey600,
+    alternateTextColor: white,
+    canvasColor: white,
+    borderColor: grey400,
+    disabledColor: fade(darkBlack, 0.3),
+    pickerHeaderColor: cyan500,
+    clockCircleColor: fade(darkBlack, 0.07),
+    shadowColor: fullBlack,
+};*/
+
+var indigoPalette = {
+    primary1Color: PRIMARY_BACKGROUND_COLOR,
+    primary2Color: indigo700,
+    primary3Color: indigo100,
+    accent1Color: deepOrange500,
+    accent2Color: grey100,
+    accent3Color: grey500,
+    textColor: grey900,
+    secondaryTextColor: grey600,
+    alternateTextColor: white,
+    canvasColor: white,
+    borderColor: grey400,
+    disabledColor: fade(darkBlack, 0.3),
+    pickerHeaderColor: cyan500,
+    clockCircleColor: fade(darkBlack, 0.07),
+    shadowColor: fullBlack,
+};
+
+export default {
+    spacing: spacing,
+    fontFamily: 'RobotoDraft, Roboto, \'Helvetica Neue\', sans-serif',
+    palette: indigoPalette,
+};
\ No newline at end of file

diff --git a/ui/src/app/components/scope-element.directive.js b/ui/src/app/components/scope-element.directive.js
new file mode 100644
index 0000000..73f11c3
--- /dev/null
+++ b/ui/src/app/components/scope-element.directive.js
@@ -0,0 +1,33 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.directives.scopeElement', [])
+    .directive('tbScopeElement', ScopeElement)
+    .name;
+
+/*@ngInject*/
+function ScopeElement() {
+    var directiveDefinitionObject = {
+        restrict: "A",
+        compile: function compile() {
+            return {
+                pre: function preLink(scope, iElement, iAttrs) {
+                    scope[iAttrs.tbScopeElement] = iElement;
+                }
+            };
+        }
+    };
+    return directiveDefinitionObject;
+}

diff --git a/ui/src/app/components/side-menu.directive.js b/ui/src/app/components/side-menu.directive.js
new file mode 100644
index 0000000..9127198
--- /dev/null
+++ b/ui/src/app/components/side-menu.directive.js
@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './side-menu.scss';
+
+import thingsboardMenu from '../services/menu.service';
+import thingsboardMenuLink from './menu-link.directive';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import sidemenuTemplate from './side-menu.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.sideMenu', [thingsboardMenu, thingsboardMenuLink])
+    .directive('tbSideMenu', SideMenu)
+    .name;
+
+/*@ngInject*/
+function SideMenu($compile, $templateCache, menu) {
+
+    var linker = function (scope, element) {
+
+        scope.sections = menu.getSections();
+
+        var template = $templateCache.get(sidemenuTemplate);
+
+        element.html(template);
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        link: linker,
+        scope: {}
+    };
+}

diff --git a/ui/src/app/components/side-menu.scss b/ui/src/app/components/side-menu.scss
new file mode 100644
index 0000000..9705523
--- /dev/null
+++ b/ui/src/app/components/side-menu.scss
@@ -0,0 +1,84 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import "~compass-sass-mixins/lib/compass";
+
+.tb-side-menu .md-button.tb-active {
+  background-color: rgba(255, 255, 255, 0.15);
+  font-weight: 500;
+}
+
+.tb-side-menu, .tb-side-menu ul {
+  list-style: none;
+  padding: 0;
+  margin-top: 0;
+}
+
+.tb-side-menu .tb-menu-toggle-list a.md-button {
+  padding: 0 16px 0 32px;
+  text-transform: none;
+  text-rendering: optimizeLegibility;
+  font-weight: 500;
+}
+
+.tb-side-menu .tb-menu-toggle-list .md-button {
+  padding: 0 16px 0 32px;
+  text-transform: none;
+}
+
+.tb-side-menu .tb-menu-toggle-list .tb-menu-toggle-list a.md-button {
+  padding: 0 16px 0 48px;
+}
+
+.tb-side-menu > li {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.12);
+}
+
+.tb-side-menu .md-button-toggle .md-toggle-icon {
+  background-size: 100% auto;
+  display: inline-block;
+  margin: auto 0 auto auto;
+  width: 15px;
+  @include transition(transform .3s, ease-in-out);
+}
+
+.tb-side-menu .md-button {
+  display: block;
+  border-radius: 0;
+  color: inherit;
+  cursor: pointer;
+  line-height: 40px;
+  margin: 0;
+  max-height: 40px;
+  overflow: hidden;
+  padding: 0px 16px;
+  text-align: left;
+  text-decoration: none;
+  white-space: normal;
+  width: 100%;
+}
+
+.tb-side-menu tb-menu-link span.md-toggle-icon {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
+
+.tb-side-menu ng-md-icon {
+  margin-right: 8px;
+}
+
+.tb-side-menu md-icon {
+  margin-right: 8px;
+}

diff --git a/ui/src/app/components/side-menu.tpl.html b/ui/src/app/components/side-menu.tpl.html
new file mode 100644
index 0000000..200fe4e
--- /dev/null
+++ b/ui/src/app/components/side-menu.tpl.html
@@ -0,0 +1,23 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<ul flex layout="column" layout-align="start stretch" class="tb-side-menu">
+   	  <li ng-repeat="section in sections" class="parent-list-item" 
+	      				ng-class="{'parentActive' : isOpen(section)}"> 
+			<tb-menu-link section="section"></tb-menu-link>
+      </li>
+</ul>
\ No newline at end of file

diff --git a/ui/src/app/components/tb-event-directives.js b/ui/src/app/components/tb-event-directives.js
new file mode 100644
index 0000000..1fefd51
--- /dev/null
+++ b/ui/src/app/components/tb-event-directives.js
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const SPECIAL_CHARS_REGEXP = /([\:\-\_]+(.))/g;
+const MOZ_HACK_REGEXP = /^moz([A-Z])/;
+const PREFIX_REGEXP = /^((?:x|data)[\:\-_])/i;
+
+var tbEventDirectives = {};
+
+angular.forEach(
+    'click dblclick mousedown mouseup mouseover mouseout mousemove mouseenter mouseleave keydown keyup keypress submit focus blur copy cut paste'.split(' '),
+    function(eventName) {
+        var directiveName = directiveNormalize('tb-' + eventName);
+        tbEventDirectives[directiveName] = ['$parse', '$rootScope', function($parse) {
+            return {
+                restrict: 'A',
+                compile: function($element, attr) {
+                    var fn = $parse(attr[directiveName], /* interceptorFn */ null, /* expensiveChecks */ true);
+                    return function ngEventHandler(scope, element) {
+                        element.on(eventName, function(event) {
+                            var callback = function() {
+                                fn(scope, {$event:event});
+                            };
+                            callback();
+                        });
+                    };
+                }
+            };
+        }];
+    }
+);
+
+export default angular.module('thingsboard.directives.event', [])
+    .directive(tbEventDirectives)
+    .name;
+
+function camelCase(name) {
+    return name.
+    replace(SPECIAL_CHARS_REGEXP, function(_, separator, letter, offset) {
+        return offset ? letter.toUpperCase() : letter;
+    }).
+    replace(MOZ_HACK_REGEXP, 'Moz$1');
+}
+
+function directiveNormalize(name) {
+    return camelCase(name.replace(PREFIX_REGEXP, ''));
+}
\ No newline at end of file

diff --git a/ui/src/app/components/timeinterval.directive.js b/ui/src/app/components/timeinterval.directive.js
new file mode 100644
index 0000000..1381b2c
--- /dev/null
+++ b/ui/src/app/components/timeinterval.directive.js
@@ -0,0 +1,213 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './timeinterval.scss';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import timeintervalTemplate from './timeinterval.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+export default angular.module('thingsboard.directives.timeinterval', [])
+    .directive('tbTimeinterval', Timeinterval)
+    .name;
+
+/*@ngInject*/
+function Timeinterval($compile, $templateCache, $translate) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+
+        var template = $templateCache.get(timeintervalTemplate);
+        element.html(template);
+
+        scope.rendered = false;
+        scope.days = 0;
+        scope.hours = 0;
+        scope.mins = 1;
+        scope.secs = 0;
+
+        scope.predefIntervals = [
+            {
+                name: $translate.instant('timeinterval.seconds-interval', {seconds: 10}, 'messageformat'),
+                value: 10 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.seconds-interval', {seconds: 30}, 'messageformat'),
+                value: 30 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.minutes-interval', {minutes: 1}, 'messageformat'),
+                value: 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.minutes-interval', {minutes: 2}, 'messageformat'),
+                value: 2 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.minutes-interval', {minutes: 5}, 'messageformat'),
+                value: 5 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.minutes-interval', {minutes: 10}, 'messageformat'),
+                value: 10 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.minutes-interval', {minutes: 30}, 'messageformat'),
+                value: 30 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.hours-interval', {hours: 1}, 'messageformat'),
+                value: 60 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.hours-interval', {hours: 2}, 'messageformat'),
+                value: 2 * 60 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.hours-interval', {hours: 10}, 'messageformat'),
+                value: 10 * 60 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.days-interval', {days: 1}, 'messageformat'),
+                value: 24 * 60 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.days-interval', {days: 7}, 'messageformat'),
+                value: 7 * 24 * 60 * 60 * 1000
+            },
+            {
+                name: $translate.instant('timeinterval.days-interval', {days: 30}, 'messageformat'),
+                value: 30 * 24 * 60 * 60 * 1000
+            }
+        ];
+
+        scope.setIntervalMs = function (intervalMs) {
+            var intervalSeconds = Math.floor(intervalMs / 1000);
+            scope.days = Math.floor(intervalSeconds / 86400);
+            scope.hours = Math.floor((intervalSeconds % 86400) / 3600);
+            scope.mins = Math.floor(((intervalSeconds % 86400) % 3600) / 60);
+            scope.secs = intervalSeconds % 60;
+        }
+
+        ngModelCtrl.$render = function () {
+            if (ngModelCtrl.$viewValue) {
+                var intervalMs = ngModelCtrl.$viewValue;
+                scope.setIntervalMs(intervalMs);
+            }
+            scope.rendered = true;
+        }
+
+        scope.updateView = function () {
+            if (!scope.rendered) {
+                return;
+            }
+            var value = null;
+            var intervalMs = (scope.days * 86400 +
+                scope.hours * 3600 +
+                scope.mins * 60 +
+                scope.secs) * 1000;
+            if (!isNaN(intervalMs) && intervalMs > 0) {
+                value = intervalMs;
+                ngModelCtrl.$setValidity('tb-timeinterval', true);
+            } else {
+                ngModelCtrl.$setValidity('tb-timeinterval', !scope.required);
+            }
+            ngModelCtrl.$setViewValue(value);
+        }
+
+        scope.$watch('required', function (newRequired, prevRequired) {
+            if (angular.isDefined(newRequired) && newRequired !== prevRequired) {
+                scope.updateView();
+            }
+        });
+
+        scope.$watch('secs', function (newSecs) {
+            if (angular.isUndefined(newSecs)) {
+                return;
+            }
+            if (newSecs < 0) {
+                if ((scope.days + scope.hours + scope.mins) > 0) {
+                    scope.secs = newSecs + 60;
+                    scope.mins--;
+                } else {
+                    scope.secs = 0;
+                }
+            } else if (newSecs >= 60) {
+                scope.secs = newSecs - 60;
+                scope.mins++;
+            }
+            scope.updateView();
+        });
+
+        scope.$watch('mins', function (newMins) {
+            if (angular.isUndefined(newMins)) {
+                return;
+            }
+            if (newMins < 0) {
+                if ((scope.days + scope.hours) > 0) {
+                    scope.mins = newMins + 60;
+                    scope.hours--;
+                } else {
+                    scope.mins = 0;
+                }
+            } else if (newMins >= 60) {
+                scope.mins = newMins - 60;
+                scope.hours++;
+            }
+            scope.updateView();
+        });
+
+        scope.$watch('hours', function (newHours) {
+            if (angular.isUndefined(newHours)) {
+                return;
+            }
+            if (newHours < 0) {
+                if (scope.days > 0) {
+                    scope.hours = newHours + 24;
+                    scope.days--;
+                } else {
+                    scope.hours = 0;
+                }
+            } else if (newHours >= 24) {
+                scope.hours = newHours - 24;
+                scope.days++;
+            }
+            scope.updateView();
+        });
+
+        scope.$watch('days', function (newDays) {
+            if (angular.isUndefined(newDays)) {
+                return;
+            }
+            if (newDays < 0) {
+                scope.days = 0;
+            }
+            scope.updateView();
+        });
+
+        $compile(element.contents())(scope);
+
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        scope: {
+            required: '=ngRequired'
+        },
+        link: linker
+    };
+}

diff --git a/ui/src/app/components/timeinterval.scss b/ui/src/app/components/timeinterval.scss
new file mode 100644
index 0000000..015ca18
--- /dev/null
+++ b/ui/src/app/components/timeinterval.scss
@@ -0,0 +1,34 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+tb-timeinterval {
+  md-input-container {
+    margin-bottom: 0px;
+    .md-errors-spacer {
+      min-height: 0px;
+    }
+  }
+  mdp-date-picker {
+    .md-input {
+      width: 150px;
+    }
+  }
+}
+
+tb-timeinterval {
+  .md-input {
+    width: 70px !important;
+  }
+}

diff --git a/ui/src/app/components/timeinterval.tpl.html b/ui/src/app/components/timeinterval.tpl.html
new file mode 100644
index 0000000..89c1dcd
--- /dev/null
+++ b/ui/src/app/components/timeinterval.tpl.html
@@ -0,0 +1,47 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section layout="row" layout-align="start start">
+	<md-input-container>
+		 <label translate>timeinterval.days</label>
+	     <input type="number" ng-model="days" step="1" aria-label="{{ 'timeinterval.days' | translate }}">
+	</md-input-container>
+	<md-input-container>
+		 <label translate>timeinterval.hours</label>
+	     <input type="number" ng-model="hours" step="1" aria-label="{{ 'timeinterval.hours' | translate }}">
+	</md-input-container>
+	<md-input-container>
+		 <label translate>timeinterval.minutes</label>
+	     <input type="number" ng-model="mins" step="1" aria-label="{{ 'timeinterval.minutes' | translate }}">
+	</md-input-container>
+	<md-input-container>
+		 <label translate>timeinterval.seconds</label>
+	     <input type="number" ng-model="secs" step="1" aria-label="{{ 'timeinterval.seconds' | translate }}">
+	</md-input-container>
+     <md-menu md-position-mode="target-right target">
+      <md-button class="md-icon-button"  aria-label="Open intervals" ng-click="$mdOpenMenu($event)">
+      	<md-icon md-menu-origin aria-label="arrow_drop_down" class="material-icons">arrow_drop_down</md-icon>	
+      </md-button>
+      <md-menu-content width="4">
+        <md-menu-item ng-repeat="interval in predefIntervals" >
+          <md-button ng-click="setIntervalMs(interval.value)">
+			<span>{{interval.name}}</span>
+          </md-button>
+        </md-menu-item>
+      </md-menu-content>
+     </md-menu>		
+</section>

diff --git a/ui/src/app/components/timewindow.directive.js b/ui/src/app/components/timewindow.directive.js
new file mode 100644
index 0000000..b3da4c8
--- /dev/null
+++ b/ui/src/app/components/timewindow.directive.js
@@ -0,0 +1,242 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './timewindow.scss';
+
+import thingsboardTimeinterval from './timeinterval.directive';
+import thingsboardDatetimePeriod from './datetime-period.directive';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import timewindowButtonTemplate from './timewindow-button.tpl.html';
+import timewindowTemplate from './timewindow.tpl.html';
+import timewindowPanelTemplate from './timewindow-panel.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+import TimewindowPanelController from './timewindow-panel.controller';
+
+export default angular.module('thingsboard.directives.timewindow', [thingsboardTimeinterval, thingsboardDatetimePeriod])
+    .controller('TimewindowPanelController', TimewindowPanelController)
+    .directive('tbTimewindow', Timewindow)
+    .filter('milliSecondsToTimeString', MillisecondsToTimeString)
+    .name;
+
+/*@ngInject*/
+function Timewindow($compile, $templateCache, $filter, $mdPanel, $document, $translate) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+
+        /* tbTimewindow (ng-model)
+         * {
+         * 	  realtime: {
+         * 			timewindowMs: 0
+         * 	  },
+         * 	  history: {
+         * 			timewindowMs: 0,
+         * 			fixedTimewindow: {
+         * 				startTimeMs: 0,
+         * 				endTimeMs: 0
+         * 			}
+         * 	  }
+         * }
+         */
+
+        scope.historyOnly = angular.isDefined(attrs.historyOnly);
+
+        var translationPending = false;
+
+        $translate.onReady(function() {
+            if (translationPending) {
+                scope.updateDisplayValue();
+                translationPending = false;
+            }
+        });
+
+        var template;
+        if (scope.asButton) {
+            template = $templateCache.get(timewindowButtonTemplate);
+        } else {
+            template = $templateCache.get(timewindowTemplate);
+        }
+        element.html(template);
+
+        scope.isHovered = false;
+
+        scope.onHoverIn = function () {
+            scope.isHovered = true;
+        }
+
+        scope.onHoverOut = function () {
+            scope.isHovered = false;
+        }
+
+        scope.openEditMode = function (event) {
+            var position = $mdPanel.newPanelPosition()
+                .relativeTo(element)
+                .addPanelPosition($mdPanel.xPosition.ALIGN_START, $mdPanel.yPosition.BELOW);
+            var config = {
+                attachTo: angular.element($document[0].body),
+                controller: 'TimewindowPanelController',
+                controllerAs: 'vm',
+                templateUrl: timewindowPanelTemplate,
+                panelClass: 'tb-timewindow-panel',
+                position: position,
+                locals: {
+                    'timewindow': angular.copy(scope.model),
+                    'historyOnly': scope.historyOnly,
+                    'onTimewindowUpdate': function (timewindow) {
+                        scope.model = timewindow;
+                        scope.updateView();
+                    }
+                },
+                openFrom: event,
+                clickOutsideToClose: true,
+                escapeToClose: true,
+                focusOnOpen: false
+            };
+            $mdPanel.open(config);
+        }
+
+        scope.updateView = function () {
+            var value = {};
+            var model = scope.model;
+            if (model.selectedTab === 0) {
+                value.realtime = {
+                    timewindowMs: model.realtime.timewindowMs
+                };
+            } else {
+                if (model.history.historyType === 0) {
+                    value.history = {
+                        timewindowMs: model.history.timewindowMs
+                    };
+                } else {
+                    value.history = {
+                        fixedTimewindow: {
+                            startTimeMs: model.history.fixedTimewindow.startTimeMs,
+                            endTimeMs: model.history.fixedTimewindow.endTimeMs
+                        }
+                    };
+                }
+            }
+
+            ngModelCtrl.$setViewValue(value);
+            scope.updateDisplayValue();
+        }
+
+        scope.updateDisplayValue = function () {
+            if ($translate.isReady()) {
+                if (scope.model.selectedTab === 0 && !scope.historyOnly) {
+                    scope.model.displayValue = $translate.instant('timewindow.realtime') + ' - ' +
+                        $translate.instant('timewindow.last-prefix') + ' ' +
+                        $filter('milliSecondsToTimeString')(scope.model.realtime.timewindowMs);
+                } else {
+                    scope.model.displayValue = !scope.historyOnly ? ($translate.instant('timewindow.history') + ' - ') : '';
+                    if (scope.model.history.historyType === 0) {
+                        scope.model.displayValue += $translate.instant('timewindow.last-prefix') + ' ' +
+                            $filter('milliSecondsToTimeString')(scope.model.history.timewindowMs);
+                    } else {
+                        var startString = $filter('date')(scope.model.history.fixedTimewindow.startTimeMs, 'yyyy-MM-dd HH:mm:ss');
+                        var endString = $filter('date')(scope.model.history.fixedTimewindow.endTimeMs, 'yyyy-MM-dd HH:mm:ss');
+                        scope.model.displayValue += $translate.instant('timewindow.period', {startTime: startString, endTime: endString});
+                    }
+                }
+            } else {
+                translationPending = true;
+            }
+        }
+
+        ngModelCtrl.$render = function () {
+            var currentTime = (new Date).getTime();
+            scope.model = {
+                displayValue: "",
+                selectedTab: 0,
+                realtime: {
+                    timewindowMs: 60000 // 1 min by default
+                },
+                history: {
+                    historyType: 0,
+                    timewindowMs: 60000, // 1 min by default
+                    fixedTimewindow: {
+                        startTimeMs: currentTime - 24 * 60 * 60 * 1000, // 1 day by default
+                        endTimeMs: currentTime
+                    }
+                }
+            };
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                var model = scope.model;
+                if (angular.isDefined(value.realtime)) {
+                    model.selectedTab = 0;
+                    model.realtime.timewindowMs = value.realtime.timewindowMs;
+                } else {
+                    model.selectedTab = 1;
+                    if (angular.isDefined(value.history.timewindowMs)) {
+                        model.history.historyType = 0;
+                        model.history.timewindowMs = value.history.timewindowMs;
+                    } else {
+                        model.history.historyType = 1;
+                        model.history.fixedTimewindow.startTimeMs = value.history.fixedTimewindow.startTimeMs;
+                        model.history.fixedTimewindow.endTimeMs = value.history.fixedTimewindow.endTimeMs;
+                    }
+                }
+            }
+            scope.updateDisplayValue();
+        };
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        scope: {
+            asButton: '=asButton'
+        },
+        link: linker
+    };
+}
+
+/*@ngInject*/
+function MillisecondsToTimeString($translate) {
+    return function (millseconds) {
+        var seconds = Math.floor(millseconds / 1000);
+        var days = Math.floor(seconds / 86400);
+        var hours = Math.floor((seconds % 86400) / 3600);
+        var minutes = Math.floor(((seconds % 86400) % 3600) / 60);
+        seconds = seconds % 60;
+        var timeString = '';
+        if (days > 0) timeString += $translate.instant('timewindow.days', {days: days}, 'messageformat');
+        if (hours > 0) {
+            if (timeString.length === 0 && hours === 1) {
+                hours = 0;
+            }
+            timeString += $translate.instant('timewindow.hours', {hours: hours}, 'messageformat');
+        }
+        if (minutes > 0) {
+            if (timeString.length === 0 && minutes === 1) {
+                minutes = 0;
+            }
+            timeString += $translate.instant('timewindow.minutes', {minutes: minutes}, 'messageformat');
+        }
+        if (seconds > 0) {
+            if (timeString.length === 0 && seconds === 1) {
+                seconds = 0;
+            }
+            timeString += $translate.instant('timewindow.seconds', {seconds: seconds}, 'messageformat');
+        }
+        return timeString;
+    }
+}
\ No newline at end of file

diff --git a/ui/src/app/components/timewindow.scss b/ui/src/app/components/timewindow.scss
new file mode 100644
index 0000000..1d2c738
--- /dev/null
+++ b/ui/src/app/components/timewindow.scss
@@ -0,0 +1,27 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+.tb-timewindow-panel {
+  position: absolute;
+  background: white;
+  border-radius: 4px;
+  box-shadow: 0 7px 8px -4px rgba(0, 0, 0, 0.2),
+  0 13px 19px 2px rgba(0, 0, 0, 0.14),
+  0 5px 24px 4px rgba(0, 0, 0, 0.12);
+  overflow: hidden;
+  md-content {
+    background-color: #fff;
+  }
+}

diff --git a/ui/src/app/components/timewindow.tpl.html b/ui/src/app/components/timewindow.tpl.html
new file mode 100644
index 0000000..d618e94
--- /dev/null
+++ b/ui/src/app/components/timewindow.tpl.html
@@ -0,0 +1,23 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<section ng-mouseover="onHoverIn()" ng-mouseleave="onHoverOut()" layout='row' layout-align="start center" style="min-height: 32px;">
+	<span ng-click="openEditMode($event)">{{model.displayValue}}</span>
+    <md-button class="md-icon-button tb-md-32" aria-label="{{ 'timewindow.edit' | translate }}" ng-show="isHovered" ng-click="openEditMode($event)">
+     	  <md-icon aria-label="{{ 'timewindow.date-range' | translate }}" class="material-icons">date_range</md-icon>
+    </md-button>	
+</section>
\ No newline at end of file

diff --git a/ui/src/app/components/timewindow-button.tpl.html b/ui/src/app/components/timewindow-button.tpl.html
new file mode 100644
index 0000000..4bed410
--- /dev/null
+++ b/ui/src/app/components/timewindow-button.tpl.html
@@ -0,0 +1,21 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-button class="md-raised md-primary" ng-click="openEditMode($event)">
+    <md-icon class="material-icons">date_range</md-icon>
+    <span>{{model.displayValue}}</span>
+</md-button>
\ No newline at end of file

diff --git a/ui/src/app/components/timewindow-panel.controller.js b/ui/src/app/components/timewindow-panel.controller.js
new file mode 100644
index 0000000..005c3c8
--- /dev/null
+++ b/ui/src/app/components/timewindow-panel.controller.js
@@ -0,0 +1,49 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*@ngInject*/
+export default function TimewindowPanelController(mdPanelRef, $scope, timewindow, historyOnly, onTimewindowUpdate) {
+
+    var vm = this;
+
+    vm._mdPanelRef = mdPanelRef;
+    vm.timewindow = timewindow;
+    vm.historyOnly = historyOnly;
+    vm.onTimewindowUpdate = onTimewindowUpdate;
+
+    if (vm.historyOnly) {
+        vm.timewindow.selectedTab = 1;
+    }
+
+    vm._mdPanelRef.config.onOpenComplete = function () {
+        $scope.theForm.$setPristine();
+    }
+
+    $scope.$watch('vm.timewindow.selectedTab', function (newSelection, prevSelection) {
+        if (newSelection !== prevSelection) {
+            $scope.theForm.$setDirty();
+        }
+    });
+
+    vm.cancel = function () {
+        vm._mdPanelRef && vm._mdPanelRef.close();
+    };
+
+    vm.update = function () {
+        vm._mdPanelRef && vm._mdPanelRef.close().then(function () {
+            vm.onTimewindowUpdate && vm.onTimewindowUpdate(vm.timewindow);
+        });
+    };
+}

diff --git a/ui/src/app/components/timewindow-panel.tpl.html b/ui/src/app/components/timewindow-panel.tpl.html
new file mode 100644
index 0000000..fa039c0
--- /dev/null
+++ b/ui/src/app/components/timewindow-panel.tpl.html
@@ -0,0 +1,66 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<form name="theForm" ng-submit="vm.update()">
+	<fieldset ng-disabled="loading">
+		<section layout="column">
+			<md-tabs ng-class="{'tb-headless': vm.historyOnly}" flex md-dynamic-height md-selected="vm.timewindow.selectedTab" md-border-bottom>
+				<md-tab label="{{ 'timewindow.realtime' | translate }}">
+					<md-content class="md-padding" layout="column">
+						<span translate>timewindow.last</span>
+						<tb-timeinterval
+							ng-required="vm.timewindow.selectedTab === 0"
+							ng-model="vm.timewindow.realtime.timewindowMs" style="padding-top: 8px;"></tb-timeinterval>
+					</md-content>
+				</md-tab>
+				<md-tab label="{{ 'timewindow.history' | translate }}">
+					<md-content class="md-padding" layout="column">
+						<md-radio-group ng-model="vm.timewindow.history.historyType" class="md-primary">
+							<md-radio-button ng-value=0 class="md-primary md-align-top-left md-radio-interactive">
+								<section layout="column">
+									<span translate>timewindow.last</span>
+									<tb-timeinterval
+										ng-required="vm.timewindow.selectedTab === 1 && vm.timewindow.history.historyType === 0"
+										ng-show="vm.timewindow.history.historyType === 0"
+										ng-model="vm.timewindow.history.timewindowMs" style="padding-top: 8px;"></tb-timeinterval>
+								</section>	
+							</md-radio-button>
+							<md-radio-button ng-value=1 class="md-primary md-align-top-left md-radio-interactive">
+								<section layout="column">
+									<span translate>timewindow.time-period</span>
+									<tb-datetime-period
+											ng-required="vm.timewindow.selectedTab === 1 && vm.timewindow.history.historyType === 1"
+											ng-show="vm.timewindow.history.historyType === 1"
+											ng-model="vm.timewindow.history.fixedTimewindow" style="padding-top: 8px;"></tb-datetime-period>
+								</section>	
+							</md-radio-button>
+						</md-radio-group>
+					</md-content>
+				</md-tab>
+			</md-tabs>
+			<section layout="row" layout-alignment="start center">
+			      <span flex></span>
+				  <md-button ng-disabled="loading || theForm.$invalid || !theForm.$dirty" type="submit" class="md-raised md-primary">
+				  		{{ 'action.update' | translate }}
+				  </md-button>
+			      <md-button ng-disabled="loading" ng-click="vm.cancel()" style="margin-right:20px;">
+					  {{ 'action.cancel' | translate }}
+			      </md-button>
+			</section> 
+		</section>
+	</fieldset>
+</form>
\ No newline at end of file

diff --git a/ui/src/app/components/truncate.filter.js b/ui/src/app/components/truncate.filter.js
new file mode 100644
index 0000000..d56db6d
--- /dev/null
+++ b/ui/src/app/components/truncate.filter.js
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default angular.module('thingsboard.filters.truncate', [])
+    .filter('truncate', Truncate)
+    .name;
+
+/*@ngInject*/
+function Truncate () {
+    return function (value, wordwise, max, tail) {
+        if (!value) return '';
+
+        max = parseInt(max, 10);
+        if (!max) return value;
+        if (value.length <= max) return value;
+
+        value = value.substr(0, max);
+        if (wordwise) {
+            var lastspace = value.lastIndexOf(' ');
+            if (lastspace != -1) {
+                //Also remove . and , so its gives a cleaner result.
+                if (value.charAt(lastspace - 1) == '.' || value.charAt(lastspace - 1) == ',') {
+                    lastspace = lastspace - 1;
+                }
+                value = value.substr(0, lastspace);
+            }
+        }
+
+        return value + (tail || ' …');
+    };
+}

diff --git a/ui/src/app/components/widget.controller.js b/ui/src/app/components/widget.controller.js
new file mode 100644
index 0000000..565c8a1
--- /dev/null
+++ b/ui/src/app/components/widget.controller.js
@@ -0,0 +1,478 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import $ from 'jquery';
+
+/* eslint-disable angular/angularelement */
+
+/*@ngInject*/
+export default function WidgetController($scope, $timeout, $window, $element, $q, $log, types, visibleRect,
+                                         datasourceService, deviceService, isPreview, widget, deviceAliasList, fns) {
+
+    var vm = this;
+
+    var timeWindow = {};
+    var subscriptionTimewindow = {
+        fixedWindow: null,
+        realtimeWindowMs: null
+    };
+
+    /*
+     *   data = array of datasourceData
+     *   datasourceData = {
+     *   			tbDatasource,
+     *   			dataKey,     { name, config }
+     *   			data = array of [time, value]
+     *   }
+     *
+     *
+     */
+    var data = [];
+    var datasourceListeners = [];
+    var targetDeviceAliasId = null;
+    var targetDeviceId = null;
+
+    var visible = false;
+
+    var bounds = {top: 0, left: 0, bottom: 0, right: 0};
+    var lastWidth, lastHeight;
+    var containerParent = $($element);
+    var container = $('#container', $element);
+    var containerElement = container[0];
+    var inited = false;
+
+    var gridsterItemElement;
+    var timer;
+
+    var init = fns.init || function () {
+        };
+
+    var redraw = fns.redraw || function () {
+        };
+
+    var destroy = fns.destroy || function () {
+        };
+
+    $scope.$timeout = $timeout;
+    $scope.$q = $q;
+
+    $scope.rpcRejection = null;
+    $scope.rpcErrorText = null;
+    $scope.rpcEnabled = false;
+    $scope.executingRpcRequest = false;
+    $scope.executingPromises = [];
+
+    function sendCommand(oneWayElseTwoWay, method, params, timeout) {
+        if (!$scope.rpcEnabled) {
+            return $q.reject();
+        }
+
+        if ($scope.rpcRejection && $scope.rpcRejection.status !== 408) {
+            $scope.rpcRejection = null;
+            $scope.rpcErrorText = null;
+        }
+
+        var requestBody = {
+            method: method,
+            params: params
+        };
+
+        if (timeout && timeout > 0) {
+            requestBody.timeout = timeout;
+        }
+
+        var deferred = $q.defer();
+        $scope.executingRpcRequest = true;
+        if ($scope.widgetEditMode) {
+            $timeout(function() {
+                $scope.executingRpcRequest = false;
+                if (oneWayElseTwoWay) {
+                    deferred.resolve();
+                } else {
+                    deferred.resolve(requestBody);
+                }
+            }, 500);
+        } else {
+            $scope.executingPromises.push(deferred.promise);
+            var targetSendFunction = oneWayElseTwoWay ? deviceService.sendOneWayRpcCommand : deviceService.sendTwoWayRpcCommand;
+            targetSendFunction(targetDeviceId, requestBody).then(
+                function success(responseBody) {
+                    $scope.rpcRejection = null;
+                    $scope.rpcErrorText = null;
+                    var index = $scope.executingPromises.indexOf(deferred.promise);
+                    if (index >= 0) {
+                        $scope.executingPromises.splice( index, 1 );
+                    }
+                    $scope.executingRpcRequest = $scope.executingPromises.length > 0;
+                    deferred.resolve(responseBody);
+                },
+                function fail(rejection) {
+                    var index = $scope.executingPromises.indexOf(deferred.promise);
+                    if (index >= 0) {
+                        $scope.executingPromises.splice( index, 1 );
+                    }
+                    $scope.executingRpcRequest = $scope.executingPromises.length > 0;
+                    if (!$scope.executingRpcRequest || rejection.status === 408) {
+                        $scope.rpcRejection = rejection;
+                        if (rejection.status === 408) {
+                            $scope.rpcErrorText = 'Device is offline.';
+                        } else {
+                            $scope.rpcErrorText =  'Error : ' + rejection.status + ' - ' + rejection.statusText;
+                            if (rejection.data && rejection.data.length > 0) {
+                                $scope.rpcErrorText += '</br>';
+                                $scope.rpcErrorText += rejection.data;
+                            }
+                        }
+                    }
+                    deferred.reject(rejection);
+                }
+            );
+        }
+        return deferred.promise;
+    }
+
+    $scope.clearRpcError = function() {
+        $scope.rpcRejection = null;
+        $scope.rpcErrorText = null;
+    }
+
+    var controlApi = {};
+
+    controlApi.sendOneWayCommand = function(method, params, timeout) {
+        return sendCommand(true, method, params, timeout);
+    };
+
+    controlApi.sendTwoWayCommand = function(method, params, timeout) {
+        return sendCommand(false, method, params, timeout);
+    };
+
+    vm.gridsterItemInitialized = gridsterItemInitialized;
+
+    function gridsterItemInitialized(item) {
+        if (item) {
+            gridsterItemElement = $(item.$element);
+            updateVisibility();
+        }
+    }
+
+    initWidget();
+
+    function initWidget() {
+        if (widget.type !== types.widgetType.rpc.value) {
+            for (var i in widget.config.datasources) {
+                var datasource = angular.copy(widget.config.datasources[i]);
+                for (var a in datasource.dataKeys) {
+                    var dataKey = datasource.dataKeys[a];
+                    var datasourceData = {
+                        datasource: datasource,
+                        dataKey: dataKey,
+                        data: []
+                    };
+                    data.push(datasourceData);
+                }
+            }
+        } else {
+            if (widget.config.targetDeviceAliasIds && widget.config.targetDeviceAliasIds.length > 0) {
+                targetDeviceAliasId = widget.config.targetDeviceAliasIds[0];
+                if (deviceAliasList[targetDeviceAliasId]) {
+                    targetDeviceId = deviceAliasList[targetDeviceAliasId].deviceId;
+                }
+            }
+            if (targetDeviceId) {
+                $scope.rpcEnabled = true;
+            } else {
+                $scope.rpcEnabled = $scope.widgetEditMode ? true : false;
+            }
+        }
+
+        $scope.$on('toggleDashboardEditMode', function (event, isEdit) {
+            isPreview = isEdit;
+            onRedraw();
+        });
+
+        $scope.$on('gridster-item-resized', function (event, item) {
+            if (item) {
+                updateBounds();
+            }
+        });
+
+        $scope.$on('gridster-item-transition-end', function (event, item) {
+            if (item) {
+                updateBounds();
+            }
+        });
+
+        $scope.$watch(function () {
+            return widget.row + ',' + widget.col;
+        }, function () {
+            updateBounds();
+            $scope.$emit("widgetPositionChanged", widget);
+        });
+
+        $scope.$on('visibleRectChanged', function (event, newVisibleRect) {
+            visibleRect = newVisibleRect;
+            updateVisibility();
+        });
+
+        $scope.$on('onWidgetFullscreenChanged', function(event, isWidgetExpanded, fullscreenWidget) {
+            if (widget === fullscreenWidget) {
+                onRedraw(0);
+            }
+        });
+
+        $scope.$on('deviceAliasListChanged', function (event, newDeviceAliasList) {
+            deviceAliasList = newDeviceAliasList;
+            if (widget.type === types.widgetType.rpc.value) {
+                if (targetDeviceAliasId) {
+                    var deviceId = null;
+                    if (deviceAliasList[targetDeviceAliasId]) {
+                        deviceId = deviceAliasList[targetDeviceAliasId].deviceId;
+                    }
+                    if (!angular.equals(deviceId, targetDeviceId)) {
+                        targetDeviceId = deviceId;
+                        if (targetDeviceId) {
+                            $scope.rpcEnabled = true;
+                        } else {
+                            $scope.rpcEnabled = $scope.widgetEditMode ? true : false;
+                        }
+                        inited = false;
+                        onRedraw();
+                    }
+                }
+            } else {
+                checkSubscriptions();
+            }
+        });
+
+        $scope.$on("$destroy", function () {
+            unsubscribe();
+            destroy();
+        });
+
+        subscribe();
+
+        if (widget.type === types.widgetType.timeseries.value) {
+            $scope.$watch(function () {
+                return widget.config.timewindow;
+            }, function (newTimewindow, prevTimewindow) {
+                if (!angular.equals(newTimewindow, prevTimewindow)) {
+                    unsubscribe();
+                    subscribe();
+                }
+            });
+        } else if (widget.type === types.widgetType.rpc.value) {
+            if (!inited) {
+                init(containerElement, widget.config.settings, widget.config.datasources, data, $scope, controlApi);
+                inited = true;
+            }
+        }
+    }
+
+    function updateVisibility(forceRedraw) {
+        if (visibleRect) {
+            forceRedraw = forceRedraw || visibleRect.containerResized;
+            var newVisible = false;
+            if (visibleRect.isMobile && gridsterItemElement) {
+                var topPx = gridsterItemElement.position().top;
+                var bottomPx = topPx + widget.sizeY * visibleRect.curRowHeight;
+                newVisible = !(topPx > visibleRect.bottomPx ||
+                bottomPx < visibleRect.topPx);
+            } else {
+                newVisible = !(bounds.left > visibleRect.right ||
+                bounds.right < visibleRect.left ||
+                bounds.top > visibleRect.bottom ||
+                bounds.bottom < visibleRect.top);
+            }
+            if (visible != newVisible) {
+                visible = newVisible;
+                if (visible) {
+                    onRedraw(50);
+                }
+            } else if (forceRedraw && visible) {
+                onRedraw(50);
+            }
+        }
+    }
+
+    function updateBounds() {
+        bounds = {
+            top: widget.row,
+            left: widget.col,
+            bottom: widget.row + widget.sizeY,
+            right: widget.col + widget.sizeX
+        };
+        updateVisibility(true);
+    }
+
+
+    function onRedraw(delay, dataUpdate) {
+        if (!visible) {
+            return;
+        }
+        if (angular.isUndefined(delay)) {
+            delay = 0;
+        }
+        $timeout(function () {
+            var width = containerParent.width();
+            var height = containerParent.height();
+            var sizeChanged = false;
+
+            if (!lastWidth || lastWidth != width || !lastHeight || lastHeight != height) {
+                if (width > 0 && height > 0) {
+                    container.css('height', height + 'px');
+                    container.css('width', width + 'px');
+                    lastWidth = width;
+                    lastHeight = height;
+                    sizeChanged = true;
+                }
+            }
+
+            if (width > 20 && height > 20) {
+                if (!inited) {
+                    init(containerElement, widget.config.settings, widget.config.datasources, data, $scope, controlApi);
+                    inited = true;
+                }
+                if (widget.type === types.widgetType.timeseries.value) {
+                    if (dataUpdate && timer) {
+                        $timeout.cancel(timer);
+                        timer = $timeout(onTick, 1500, false);
+                    }
+                    if (subscriptionTimewindow.realtimeWindowMs) {
+                        timeWindow.maxTime = (new Date).getTime();
+                        timeWindow.minTime = timeWindow.maxTime - subscriptionTimewindow.realtimeWindowMs;
+                    } else if (subscriptionTimewindow.fixedWindow) {
+                        timeWindow.maxTime = subscriptionTimewindow.fixedWindow.endTimeMs;
+                        timeWindow.minTime = subscriptionTimewindow.fixedWindow.startTimeMs;
+                    }
+                }
+                redraw(containerElement, width, height, data, timeWindow, sizeChanged, $scope);
+            }
+        }, delay, false);
+    }
+
+    function onDataUpdated(sourceData, datasourceIndex, dataKeyIndex) {
+        data[datasourceIndex + dataKeyIndex].data = sourceData;
+        onRedraw(0, true);
+    }
+
+    function checkSubscriptions() {
+        if (widget.type !== types.widgetType.rpc.value) {
+            var subscriptionsChanged = false;
+            for (var i in datasourceListeners) {
+                var listener = datasourceListeners[i];
+                var deviceId = null;
+                var aliasName = null;
+                if (listener.datasource.type === types.datasourceType.device) {
+                    if (deviceAliasList[listener.datasource.deviceAliasId]) {
+                        deviceId = deviceAliasList[listener.datasource.deviceAliasId].deviceId;
+                        aliasName = deviceAliasList[listener.datasource.deviceAliasId].alias;
+                    }
+                    if (!angular.equals(deviceId, listener.deviceId) ||
+                        !angular.equals(aliasName, listener.datasource.name)) {
+                        subscriptionsChanged = true;
+                        break;
+                    }
+                }
+            }
+            if (subscriptionsChanged) {
+                unsubscribe();
+                subscribe();
+            }
+        }
+    }
+
+    function unsubscribe() {
+        if (widget.type !== types.widgetType.rpc.value) {
+            if (timer) {
+                $timeout.cancel(timer);
+                timer = null;
+            }
+            for (var i in datasourceListeners) {
+                var listener = datasourceListeners[i];
+                datasourceService.unsubscribeFromDatasource(listener);
+            }
+        }
+    }
+
+    function onTick() {
+        onRedraw();
+        timer = $timeout(onTick, 1000, false);
+    }
+
+    function subscribe() {
+        if (widget.type !== types.widgetType.rpc.value) {
+            var index = 0;
+            subscriptionTimewindow.fixedWindow = null;
+            subscriptionTimewindow.realtimeWindowMs = null;
+            if (widget.type === types.widgetType.timeseries.value &&
+                angular.isDefined(widget.config.timewindow)) {
+                if (angular.isDefined(widget.config.timewindow.realtime)) {
+                    subscriptionTimewindow.realtimeWindowMs = widget.config.timewindow.realtime.timewindowMs;
+                } else if (angular.isDefined(widget.config.timewindow.history)) {
+                    if (angular.isDefined(widget.config.timewindow.history.timewindowMs)) {
+                        var currentTime = (new Date).getTime();
+                        subscriptionTimewindow.fixedWindow = {
+                            startTimeMs: currentTime - widget.config.timewindow.history.timewindowMs,
+                            endTimeMs: currentTime
+                        }
+                    } else {
+                        subscriptionTimewindow.fixedWindow = {
+                            startTimeMs: widget.config.timewindow.history.fixedTimewindow.startTimeMs,
+                            endTimeMs: widget.config.timewindow.history.fixedTimewindow.endTimeMs
+                        }
+                    }
+                }
+            }
+            for (var i in widget.config.datasources) {
+                var datasource = widget.config.datasources[i];
+                var deviceId = null;
+                if (datasource.type === types.datasourceType.device && datasource.deviceAliasId) {
+                    if (deviceAliasList[datasource.deviceAliasId]) {
+                        deviceId = deviceAliasList[datasource.deviceAliasId].deviceId;
+                        datasource.name = deviceAliasList[datasource.deviceAliasId].alias;
+                    }
+                } else {
+                    datasource.name = types.datasourceType.function;
+                }
+                var listener = {
+                    widget: widget,
+                    subscriptionTimewindow: subscriptionTimewindow,
+                    datasource: datasource,
+                    deviceId: deviceId,
+                    dataUpdated: function (data, datasourceIndex, dataKeyIndex) {
+                        onDataUpdated(data, datasourceIndex, dataKeyIndex);
+                    },
+                    datasourceIndex: index
+                };
+
+                for (var a = 0; a < datasource.dataKeys.length; a++) {
+                    data[index + a].data = [];
+                }
+
+                index += datasource.dataKeys.length;
+
+                datasourceListeners.push(listener);
+                datasourceService.subscribeToDatasource(listener);
+            }
+
+            if (subscriptionTimewindow.realtimeWindowMs) {
+                timer = $timeout(onTick, 0, false);
+            }
+        }
+    }
+
+}
+
+/* eslint-enable angular/angularelement */
\ No newline at end of file

diff --git a/ui/src/app/components/widget.directive.js b/ui/src/app/components/widget.directive.js
new file mode 100644
index 0000000..6ba25c3
--- /dev/null
+++ b/ui/src/app/components/widget.directive.js
@@ -0,0 +1,127 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import thingsboardTypes from '../common/types.constant';
+import thingsboardApiDatasource from '../api/datasource.service';
+
+import WidgetController from './widget.controller';
+
+export default angular.module('thingsboard.directives.widget', [thingsboardTypes, thingsboardApiDatasource])
+    .controller('WidgetController', WidgetController)
+    .directive('tbWidget', Widget)
+    .name;
+
+/*@ngInject*/
+function Widget($controller, $compile, widgetService) {
+    return {
+        scope: true,
+        link: function (scope, elem, attrs) {
+
+            var widgetController;
+            var locals = scope.$eval(attrs.locals);
+            var widget = locals.widget;
+            var gridsterItem;
+
+            scope.$on('gridster-item-initialized', function (event, item) {
+                gridsterItem = item;
+                if (widgetController) {
+                    widgetController.gridsterItemInitialized(gridsterItem);
+                }
+            })
+
+            elem.html('<div flex layout="column" layout-align="center center" style="height: 100%;">' +
+                      '     <md-progress-circular md-mode="indeterminate" class="md-accent md-hue-2" md-diameter="120"></md-progress-circular>' +
+                      '</div>');
+            $compile(elem.contents())(scope);
+
+            widgetService.getWidgetInfo(widget.bundleAlias, widget.typeAlias, widget.isSystemType).then(
+                function(widgetInfo) {
+                    loadFromWidgetInfo(widgetInfo);
+                }
+            );
+
+            function loadFromWidgetInfo(widgetInfo) {
+
+                elem.addClass("tb-widget");
+
+                var widgetNamespace = "widget-type-" + (widget.isSystemType ? 'sys-' : '')
+                    + widget.bundleAlias + '-'
+                    + widget.typeAlias;
+
+                elem.addClass(widgetNamespace);
+                elem.html('<div id="container">' + widgetInfo.templateHtml + '</div>');
+
+                $compile(elem.contents())(scope);
+
+                angular.extend(locals, {$scope: scope, $element: elem});
+
+                var controllerFunctionBody = 'var fns = { init: null, redraw: null, destroy: null };';
+                controllerFunctionBody += widgetInfo.controllerScript;
+                controllerFunctionBody += '' +
+                    'angular.extend(this, $controller(\'WidgetController\',' +
+                    '{' +
+                    '$scope: $scope,' +
+                    '$timeout: $timeout,' +
+                    '$window: $window,' +
+                    '$element: $element,' +
+                    '$log: $log,' +
+                    'types: types,' +
+                    'visibleRect: visibleRect,' +
+                    'datasourceService: datasourceService,' +
+                    'deviceService: deviceService,' +
+                    'isPreview: isPreview,' +
+                    'widget: widget,' +
+                    'deviceAliasList: deviceAliasList,' +
+                    'fns: fns' +
+                    '}));' +
+                    '';
+
+                var controllerFunction = new Function("$scope",
+                    "$timeout",
+                    "$window",
+                    "$element",
+                    "$log",
+                    'types',
+                    "visibleRect",
+                    "datasourceService",
+                    "deviceService",
+                    "$controller",
+                    "isPreview",
+                    "widget",
+                    "deviceAliasList",
+                    controllerFunctionBody);
+
+                controllerFunction.$inject = ["$scope",
+                    "$timeout",
+                    "$window",
+                    "$element",
+                    "$log",
+                    'types',
+                    "visibleRect",
+                    "datasourceService",
+                    "deviceService",
+                    "$controller",
+                    "isPreview",
+                    "widget",
+                    "deviceAliasList"];
+
+                widgetController = $controller(controllerFunction, locals);
+                if (gridsterItem) {
+                    widgetController.gridsterItemInitialized(gridsterItem);
+                }
+            }
+        }
+    };
+}

diff --git a/ui/src/app/components/widget-config.directive.js b/ui/src/app/components/widget-config.directive.js
new file mode 100644
index 0000000..ee6675d
--- /dev/null
+++ b/ui/src/app/components/widget-config.directive.js
@@ -0,0 +1,340 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import jsonSchemaDefaults from 'json-schema-defaults';
+import thingsboardTypes from '../common/types.constant';
+import thingsboardUtils from '../common/utils.service';
+import thingsboardDeviceAliasSelect from './device-alias-select.directive';
+import thingsboardDatasource from './datasource.directive';
+import thingsboardTimewindow from './timewindow.directive';
+import thingsboardJsonForm from "./json-form.directive";
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import widgetConfigTemplate from './widget-config.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/* eslint-disable angular/angularelement */
+
+export default angular.module('thingsboard.directives.widgetConfig', [thingsboardTypes,
+    thingsboardUtils,
+    thingsboardJsonForm,
+    thingsboardDeviceAliasSelect,
+    thingsboardDatasource,
+    thingsboardTimewindow])
+    .directive('tbWidgetConfig', WidgetConfig)
+    .name;
+
+/*@ngInject*/
+function WidgetConfig($compile, $templateCache, $rootScope, types, utils) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+
+        var template = $templateCache.get(widgetConfigTemplate);
+
+        element.html(template);
+
+        scope.types = types;
+        scope.widgetEditMode = $rootScope.widgetEditMode;
+
+        scope.emptySettingsSchema = {
+            type: "object",
+            properties: {}
+        };
+        scope.defaultSettingsForm = [
+            '*'
+        ];
+
+        if (angular.isUndefined(scope.forceExpandDatasources)) {
+            scope.forceExpandDatasources = false;
+        }
+
+        scope.currentSettingsSchema = {};
+        scope.currentSettings = angular.copy(scope.emptySettingsSchema);
+
+        scope.targetDeviceAlias = {
+            value: null
+        }
+
+        ngModelCtrl.$render = function () {
+            if (ngModelCtrl.$viewValue) {
+                scope.selectedTab = 0;
+                scope.title = ngModelCtrl.$viewValue.title;
+                scope.showTitle = ngModelCtrl.$viewValue.showTitle;
+                scope.backgroundColor = ngModelCtrl.$viewValue.backgroundColor;
+                scope.color = ngModelCtrl.$viewValue.color;
+                scope.padding = ngModelCtrl.$viewValue.padding;
+                scope.timewindow = ngModelCtrl.$viewValue.timewindow;
+                if (scope.widgetType !== types.widgetType.rpc.value) {
+                    if (scope.datasources) {
+                        scope.datasources.splice(0, scope.datasources.length);
+                    } else {
+                        scope.datasources = [];
+                    }
+                    if (ngModelCtrl.$viewValue.datasources) {
+                        for (var i in ngModelCtrl.$viewValue.datasources) {
+                            scope.datasources.push({value: ngModelCtrl.$viewValue.datasources[i]});
+                        }
+                    }
+                } else {
+                    if (ngModelCtrl.$viewValue.targetDeviceAliasIds && ngModelCtrl.$viewValue.targetDeviceAliasIds.length > 0) {
+                        var aliasId = ngModelCtrl.$viewValue.targetDeviceAliasIds[0];
+                        if (scope.deviceAliases[aliasId]) {
+                            scope.targetDeviceAlias.value = {id: aliasId, alias: scope.deviceAliases[aliasId].alias,
+                                deviceId: scope.deviceAliases[aliasId].deviceId};
+                        } else {
+                            scope.targetDeviceAlias.value = null;
+                        }
+                    } else {
+                        scope.targetDeviceAlias.value = null;
+                    }
+                }
+
+                scope.settings = ngModelCtrl.$viewValue.settings;
+
+                scope.updateSchemaForm();
+
+                scope.updateDatasourcesAccordionState();
+            }
+        };
+
+        scope.displayAdvanced = function() {
+            return scope.widgetSettingsSchema && scope.widgetSettingsSchema.schema;
+        }
+
+        scope.updateSchemaForm = function() {
+            if (scope.widgetSettingsSchema && scope.widgetSettingsSchema.schema) {
+                scope.currentSettingsSchema = scope.widgetSettingsSchema.schema;
+                scope.currentSettingsForm = scope.widgetSettingsSchema.form || angular.copy(scope.defaultSettingsForm);
+                scope.currentSettings = scope.settings;
+            } else {
+                scope.currentSettingsForm = angular.copy(scope.defaultSettingsForm);
+                scope.currentSettingsSchema = angular.copy(scope.emptySettingsSchema);
+                scope.currentSettings = {};
+            }
+        }
+
+        scope.$on('datasources-accordion:onReady', function () {
+            if (scope.updateDatasourcesAccordionStatePending) {
+                scope.updateDatasourcesAccordionState();
+            }
+        });
+
+        scope.updateValidity = function () {
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                var valid;
+                if (scope.widgetType === types.widgetType.rpc.value) {
+                    valid = value && value.targetDeviceAliasIds && value.targetDeviceAliasIds.length > 0;
+                    ngModelCtrl.$setValidity('targetDeviceAliasIds', valid);
+                } else {
+                    valid = value && value.datasources && value.datasources.length > 0;
+                    ngModelCtrl.$setValidity('datasources', valid);
+                }
+            }
+        };
+
+        scope.$watch('title + showTitle + backgroundColor + color + padding + intervalSec', function () {
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                value.title = scope.title;
+                value.showTitle = scope.showTitle;
+                value.backgroundColor = scope.backgroundColor;
+                value.color = scope.color;
+                value.padding = scope.padding;
+                value.intervalSec = scope.intervalSec;
+                ngModelCtrl.$setViewValue(value);
+            }
+        });
+
+        scope.$watch('currentSettings', function () {
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                value.settings = scope.currentSettings;
+                ngModelCtrl.$setViewValue(value);
+            }
+        }, true);
+
+        scope.$watch('timewindow', function () {
+            if (ngModelCtrl.$viewValue) {
+                var value = ngModelCtrl.$viewValue;
+                value.timewindow = scope.timewindow;
+                ngModelCtrl.$setViewValue(value);
+            }
+        }, true);
+
+        scope.$watch('datasources', function () {
+            if (ngModelCtrl.$viewValue && scope.widgetType !== types.widgetType.rpc.value) {
+                var value = ngModelCtrl.$viewValue;
+                if (value.datasources) {
+                    value.datasources.splice(0, value.datasources.length);
+                } else {
+                    value.datasources = [];
+                }
+                if (scope.datasources) {
+                    for (var i in scope.datasources) {
+                        value.datasources.push(scope.datasources[i].value);
+                    }
+                }
+                ngModelCtrl.$setViewValue(value);
+                scope.updateValidity();
+            }
+        }, true);
+
+        scope.$watch('targetDeviceAlias.value', function () {
+            if (ngModelCtrl.$viewValue && scope.widgetType === types.widgetType.rpc.value) {
+                var value = ngModelCtrl.$viewValue;
+                if (scope.targetDeviceAlias.value) {
+                    value.targetDeviceAliasIds = [scope.targetDeviceAlias.value.id];
+                } else {
+                    value.targetDeviceAliasIds = [];
+                }
+                ngModelCtrl.$setViewValue(value);
+                scope.updateValidity();
+            }
+        });
+
+        scope.addDatasource = function () {
+            var newDatasource;
+            if (scope.functionsOnly) {
+                newDatasource = angular.copy(utils.getDefaultDatasource(scope.datakeySettingsSchema.schema));
+                newDatasource.dataKeys = [scope.generateDataKey('Sin', types.dataKeyType.function)];
+            } else {
+                newDatasource = { type: types.datasourceType.device,
+                    dataKeys: []
+                };
+            }
+            var datasource = {value: newDatasource};
+            scope.datasources.push(datasource);
+            if (scope.theForm) {
+                scope.theForm.$setDirty();
+            }
+        }
+
+        scope.removeDatasource = function ($event, datasource) {
+            var index = scope.datasources.indexOf(datasource);
+            if (index > -1) {
+                scope.datasources.splice(index, 1);
+                if (scope.theForm) {
+                    scope.theForm.$setDirty();
+                }
+            }
+        };
+
+        scope.updateDatasourcesAccordionState = function () {
+            if (scope.widgetType !== types.widgetType.rpc.value) {
+                if (scope.datasourcesAccordion) {
+                    scope.updateDatasourcesAccordionStatePending = false;
+                    var expand = scope.datasources && scope.datasources.length < 4;
+                    if (expand) {
+                        scope.datasourcesAccordion.expand('datasources-pane');
+                    } else {
+                        scope.datasourcesAccordion.collapse('datasources-pane');
+                    }
+                } else {
+                    scope.updateDatasourcesAccordionStatePending = true;
+                }
+            }
+        }
+
+        scope.generateDataKey = function (chip, type) {
+
+            if (angular.isObject(chip)) {
+                chip._hash = Math.random();
+                return chip;
+            }
+
+            var result = {
+                name: chip,
+                type: type,
+                label: scope.genNextLabel(chip),
+                color: scope.genNextColor(),
+                settings: {},
+                _hash: Math.random()
+            };
+
+            if (type === types.dataKeyType.function) {
+                result.name = 'f(x)';
+                result.funcBody = utils.getPredefinedFunctionBody(chip);
+                if (!result.funcBody) {
+                    result.funcBody = "return prevValue + 1;";
+                }
+            }
+
+            if (angular.isDefined(scope.datakeySettingsSchema.schema)) {
+                result.settings = jsonSchemaDefaults(scope.datakeySettingsSchema.schema);
+            }
+
+            return result;
+        };
+
+        scope.genNextLabel = function (name) {
+            var label = name;
+            var value = ngModelCtrl.$viewValue;
+            var i = 1;
+            var matches = false;
+            do {
+                matches = false;
+                if (value.datasources) {
+                    for (var d in value.datasources) {
+                        var datasource = value.datasources[d];
+                        for (var k in datasource.dataKeys) {
+                            var dataKey = datasource.dataKeys[k];
+                            if (dataKey.label === label) {
+                                i++;
+                                label = name + ' ' + i;
+                                matches = true;
+                            }
+                        }
+                    }
+                }
+            } while (matches);
+            return label;
+        }
+
+        scope.genNextColor = function () {
+            var i = 0;
+            var value = ngModelCtrl.$viewValue;
+            if (value.datasources) {
+                for (var d in value.datasources) {
+                    var datasource = value.datasources[d];
+                    i += datasource.dataKeys.length;
+                }
+            }
+            return utils.getMaterialColor(i);
+        }
+
+        $compile(element.contents())(scope);
+    }
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        scope: {
+            forceExpandDatasources: '=?',
+            widgetType: '=',
+            widgetSettingsSchema: '=',
+            datakeySettingsSchema: '=',
+            deviceAliases: '=',
+            functionsOnly: '=',
+            fetchDeviceKeys: '&',
+            onCreateDeviceAlias: '&',
+            theForm: '='
+        },
+        link: linker
+    };
+}
+
+/* eslint-enable angular/angularelement */

diff --git a/ui/src/app/components/widget-config.tpl.html b/ui/src/app/components/widget-config.tpl.html
new file mode 100644
index 0000000..896e1e8
--- /dev/null
+++ b/ui/src/app/components/widget-config.tpl.html
@@ -0,0 +1,163 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-tabs ng-class="{'tb-headless': !displayAdvanced()}" id="tabs" md-border-bottom flex class="tb-absolute-fill"
+         md-selected="selectedTab">
+    <md-tab label="{{ 'widget-config.settings' | translate }}">
+        <div id="settings-tab">
+            <md-content class="md-padding" layout="column">
+                <md-input-container class="md-block">
+                    <label translate>widget-config.title</label>
+                    <input name="title" ng-model="title">
+                </md-input-container>
+                <span translate>widget-config.general-settings</span>
+                <div layout="row" layout-align="start center">
+                    <div layout="row" layout-padding>
+                        <md-checkbox flex aria-label="{{ 'widget-config.display-title' | translate }}"
+                                     ng-model="showTitle">{{ 'widget-config.display-title' | translate }}
+                        </md-checkbox>
+                    </div>
+                    <div flex
+                         md-color-picker
+                         ng-model="backgroundColor"
+                         label="{{ 'widget-config.background-color' | translate }}"
+                         icon="format_color_fill"
+                         default="#fff"
+                         md-color-clear-button="false"
+                         open-on-input="true"
+                         md-color-generic-palette="false"
+                         md-color-history="false"
+                    ></div>
+                    <div flex
+                         md-color-picker
+                         ng-model="color"
+                         label="{{ 'widget-config.text-color' | translate }}"
+                         icon="format_color_fill"
+                         default="rgba(0, 0, 0, 0.87)"
+                         md-color-clear-button="false"
+                         open-on-input="true"
+                         md-color-generic-palette="false"
+                         md-color-history="false"
+                    ></div>
+                    <md-input-container flex>
+                        <label translate>widget-config.padding</label>
+                        <input ng-model="padding">
+                    </md-input-container>
+                </div>
+                <div ng-show="widgetType === types.widgetType.timeseries.value" layout="row"
+                     layout-align="center center">
+                    <span translate style="padding-right: 8px;">widget-config.timewindow</span>
+                    <tb-timewindow as-button="true" flex ng-model="timewindow"></tb-timewindow>
+                </div>
+                <v-accordion id="datasources-accordion" control="datasourcesAccordion" class="vAccordion--default"
+                             ng-show="widgetType !== types.widgetType.rpc.value">
+                    <v-pane id="datasources-pane" expanded="forceExpandDatasources">
+                        <v-pane-header>
+                            {{ 'widget-config.datasources' | translate }}
+                        </v-pane-header>
+                        <v-pane-content>
+                            <div ng-if="datasources.length === 0">
+                                <span translate layout-align="center center"
+                                      class="tb-prompt">datasource.add-datasource-prompt</span>
+                            </div>
+                            <div ng-if="datasources.length > 0">
+                                <div flex layout="row" layout-align="start center">
+                                    <span flex="5"></span>
+                                    <div flex layout="row" layout-align="start center"
+                                         style="padding: 0 0 0 10px; margin: 5px;">
+                                        <span translate style="min-width: 110px;">widget-config.datasource-type</span>
+                                        <span translate flex
+                                              style="padding-left: 10px;">widget-config.datasource-parameters</span>
+                                        <span style="min-width: 40px;"></span>
+                                    </div>
+                                </div>
+                                <div style="max-height: 300px; overflow: auto; padding-bottom: 15px;">
+                                    <div flex layout="row" layout-align="start center"
+                                         ng-repeat="datasource in datasources">
+                                        <span flex="5">{{$index + 1}}.</span>
+                                        <div class="md-whiteframe-4dp" flex layout="row" layout-align="start center"
+                                             style="padding: 0 0 0 10px; margin: 5px;">
+                                            <tb-datasource flex ng-model="datasource.value"
+                                                           widget-type="widgetType"
+                                                           device-aliases="deviceAliases"
+                                                           functions-only="functionsOnly"
+                                                           datakey-settings-schema="datakeySettingsSchema"
+                                                           generate-data-key="generateDataKey(chip,type)"
+                                                           fetch-device-keys="fetchDeviceKeys({deviceAliasId: deviceAliasId, query: query, type: type})"
+                                                           on-create-device-alias="onCreateDeviceAlias({event: event, alias: alias})"></tb-datasource>
+                                            <md-button ng-disabled="loading" class="md-icon-button md-primary"
+                                                       style="min-width: 40px;"
+                                                       ng-click="removeDatasource($event, datasource)"
+                                                       aria-label="{{ 'action.remove' | translate }}">
+                                                <md-tooltip md-direction="top">
+                                                    {{ 'widget-config.remove-datasource' | translate }}
+                                                </md-tooltip>
+                                                <md-icon aria-label="{{ 'action.delete' | translate }}"
+                                                         class="material-icons">
+                                                    close
+                                                </md-icon>
+                                            </md-button>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div flex layout="row" layout-align="start center">
+                                <md-button ng-disabled="loading" class="md-primary md-raised"
+                                           ng-click="addDatasource($event)" aria-label="{{ 'action.add' | translate }}">
+                                    <md-tooltip md-direction="top">
+                                        {{ 'widget-config.add-datasource' | translate }}
+                                    </md-tooltip>
+                                    <md-icon class="material-icons">add</md-icon>
+                                    <span translate>action.add</span>
+                                </md-button>
+                            </div>
+                        </v-pane-content>
+                    </v-pane>
+                </v-accordion>
+                <v-accordion id="target-devices-accordion" control="targetDevicesAccordion" class="vAccordion--default"
+                             ng-show="widgetType === types.widgetType.rpc.value">
+                    <v-pane id="target-devices-pane" expanded="true">
+                        <v-pane-header>
+                            {{ 'widget-config.target-device' | translate }}
+                        </v-pane-header>
+                        <v-pane-content style="padding: 0 5px;">
+                            <tb-device-alias-select flex
+                                                    tb-required="widgetType === types.widgetType.rpc.value && !widgetEditMode"
+                                                    device-aliases="deviceAliases"
+                                                    ng-model="targetDeviceAlias.value"
+                                                    on-create-device-alias="onCreateDeviceAlias({event: event, alias: alias})">
+                            </tb-device-alias-select>
+                        </v-pane-content>
+                    </v-pane>
+                </v-accordion>
+            </md-content>
+        </div>
+    </md-tab>
+    <md-tab ng-if="displayAdvanced()" label="{{ 'widget-config.advanced' | translate }}">
+        <md-content class="md-padding" layout="column">
+            <ng-form name="ngform"
+                     layout="column"
+                     layout-padding>
+                <tb-json-form schema="currentSettingsSchema"
+                              form="currentSettingsForm"
+                              model="currentSettings"
+                              form-control="ngform">
+                </tb-json-form>
+            </ng-form>
+        </md-content>
+    </md-tab>
+</md-tabs>

diff --git a/ui/src/app/components/widgets-bundle-select.directive.js b/ui/src/app/components/widgets-bundle-select.directive.js
new file mode 100644
index 0000000..fcf5def
--- /dev/null
+++ b/ui/src/app/components/widgets-bundle-select.directive.js
@@ -0,0 +1,96 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import './widgets-bundle-select.scss';
+
+import thingsboardApiWidget from '../api/widget.service';
+
+/* eslint-disable import/no-unresolved, import/default */
+
+import widgetsBundleSelectTemplate from './widgets-bundle-select.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+
+export default angular.module('thingsboard.directives.widgetsBundleSelect', [thingsboardApiWidget])
+    .directive('tbWidgetsBundleSelect', WidgetsBundleSelect)
+    .name;
+
+/*@ngInject*/
+function WidgetsBundleSelect($compile, $templateCache, widgetService, types) {
+
+    var linker = function (scope, element, attrs, ngModelCtrl) {
+        var template = $templateCache.get(widgetsBundleSelectTemplate);
+        element.html(template);
+
+        scope.tbRequired = angular.isDefined(scope.tbRequired) ? scope.tbRequired : false;
+        scope.widgetsBundle = null;
+        scope.widgetsBundles = [];
+
+        var widgetsBundleFetchFunction = widgetService.getAllWidgetsBundles;
+        if (angular.isDefined(scope.bundlesScope)) {
+            if (scope.bundlesScope === 'system') {
+                widgetsBundleFetchFunction = widgetService.getSystemWidgetsBundles;
+            } else if (scope.bundlesScope === 'tenant') {
+                widgetsBundleFetchFunction = widgetService.getTenantWidgetsBundles;
+            }
+        }
+
+        widgetsBundleFetchFunction().then(
+            function success(widgetsBundles) {
+                scope.widgetsBundles = widgetsBundles;
+                if (scope.selectFirstBundle) {
+                    if (widgetsBundles.length > 0) {
+                        scope.widgetsBundle = widgetsBundles[0];
+                    }
+                }
+            },
+            function fail() {
+            }
+        );
+
+        scope.isSystem = function(item) {
+            return item && item.tenantId.id === types.id.nullUid;
+        }
+
+        scope.updateView = function () {
+            ngModelCtrl.$setViewValue(scope.widgetsBundle);
+        }
+
+        ngModelCtrl.$render = function () {
+            if (ngModelCtrl.$viewValue) {
+                scope.widgetsBundle = ngModelCtrl.$viewValue;
+            }
+        }
+
+        scope.$watch('widgetsBundle', function () {
+            scope.updateView();
+        });
+
+        $compile(element.contents())(scope);
+    }
+
+    return {
+        restrict: "E",
+        require: "^ngModel",
+        link: linker,
+        scope: {
+            bundlesScope: '@',
+            theForm: '=?',
+            tbRequired: '=?',
+            selectFirstBundle: '='
+        }
+    };
+}
\ No newline at end of file

diff --git a/ui/src/app/components/widgets-bundle-select.scss b/ui/src/app/components/widgets-bundle-select.scss
new file mode 100644
index 0000000..7b573f2
--- /dev/null
+++ b/ui/src/app/components/widgets-bundle-select.scss
@@ -0,0 +1,80 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import "../../scss/mixins";
+
+tb-widgets-bundle-select {
+  md-select {
+    margin: 0;
+    padding: 5px 20px;
+  }
+  .tb-bundle-item {
+    height: 24px;
+    line-height: 24px;
+  }
+}
+
+.tb-widgets-bundle-select {
+  .tb-bundle-item {
+    height: 48px;
+    line-height: 48px;
+  }
+}
+
+tb-widgets-bundle-select, .tb-widgets-bundle-select {
+  .md-text {
+    width: 100%;
+  }
+  .tb-bundle-item {
+    display: block;
+    span {
+      display: inline-block;
+      vertical-align: middle;
+    }
+    .tb-bundle-system {
+      font-size: 0.8rem;
+      opacity: 0.8;
+      float: right;
+    }
+  }
+  md-option {
+    height: auto !important;
+    white-space: normal !important;
+  }
+}
+
+md-toolbar {
+  tb-widgets-bundle-select {
+    md-select {
+      background: rgba(255,255,255,0.2);
+      .md-select-value {
+        color: #fff;
+        font-size: 1.2rem;
+        span:first-child:after {
+            color: #fff;
+        }
+      }
+      .md-select-value.md-select-placeholder {
+        color: #fff;
+        opacity: 0.8;
+      }
+    }
+    md-select.ng-invalid.ng-touched {
+      .md-select-value {
+        color: #fff !important;
+      }
+    }
+  }
+}

diff --git a/ui/src/app/components/widgets-bundle-select.tpl.html b/ui/src/app/components/widgets-bundle-select.tpl.html
new file mode 100644
index 0000000..7ba7a95
--- /dev/null
+++ b/ui/src/app/components/widgets-bundle-select.tpl.html
@@ -0,0 +1,29 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-select ng-required="tbRequired"
+           ng-model="widgetsBundle"
+           md-container-class="tb-widgets-bundle-select"
+           placeholder="{{ 'widget.select-widgets-bundle' | translate }}"
+           class="md-no-underline">
+    <md-option ng-repeat="item in widgetsBundles" ng-value="item">
+        <div class="tb-bundle-item">
+            <span>{{item.title}}</span>
+            <span translate class="tb-bundle-system" ng-if="isSystem(item)">widgets-bundle.system</span>
+        </div>
+    </md-option>
+</md-select>

diff --git a/ui/src/app/customer/add-customer.tpl.html b/ui/src/app/customer/add-customer.tpl.html
new file mode 100644
index 0000000..026342d
--- /dev/null
+++ b/ui/src/app/customer/add-customer.tpl.html
@@ -0,0 +1,46 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-dialog aria-label="{{ 'customer.add' | translate }}" tb-help="'customers'" help-container-id="help-container">
+	<form name="theForm" ng-submit="vm.add()">
+	    <md-toolbar>
+	      <div class="md-toolbar-tools">
+	        <h2 translate>customer.add</h2>
+	        <span flex></span>
+			<div id="help-container"></div>
+	        <md-button class="md-icon-button" ng-click="vm.cancel()">
+	          <ng-md-icon icon="close" aria-label="{{ 'dialog.close' | translate }}"></ng-md-icon>
+	        </md-button>
+	      </div>
+	    </md-toolbar>
+   	    <md-progress-linear class="md-warn" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+  	    <span style="min-height: 5px;" flex="" ng-show="!loading"></span>
+	    <md-dialog-content>
+	      <div class="md-dialog-content">
+  	        	<tb-customer customer="vm.item" is-edit="true" the-form="theForm"></tb-customer>
+	      </div>
+	    </md-dialog-content>
+	    <md-dialog-actions layout="row">
+	      <span flex></span>
+		  <md-button ng-disabled="loading || theForm.$invalid || !theForm.$dirty" type="submit" class="md-raised md-primary">
+		  		{{ 'action.add' | translate }}
+		  </md-button>
+	      <md-button ng-disabled="loading" ng-click="vm.cancel()" style="margin-right:20px;">{{ 'action.cancel' | translate }}</md-button>
+	    </md-dialog-actions>
+	</form>    
+</md-dialog>
+

diff --git a/ui/src/app/customer/customer.controller.js b/ui/src/app/customer/customer.controller.js
new file mode 100644
index 0000000..68a9e0f
--- /dev/null
+++ b/ui/src/app/customer/customer.controller.js
@@ -0,0 +1,164 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import addCustomerTemplate from './add-customer.tpl.html';
+import customerCard from './customer-card.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function CustomerController(customerService, $state, $stateParams, $translate) {
+
+    var customerActionsList = [
+        {
+            onAction: function ($event, item) {
+                openCustomerUsers($event, item);
+            },
+            name: function() { return $translate.instant('user.users') },
+            details: function() { return $translate.instant('customer.manage-customer-users') },
+            icon: "account_circle"
+        },
+        {
+            onAction: function ($event, item) {
+                openCustomerDevices($event, item);
+            },
+            name: function() { return $translate.instant('device.devices') },
+            details: function() { return $translate.instant('customer.manage-customer-devices') },
+            icon: "devices_other"
+        },
+        {
+            onAction: function ($event, item) {
+                openCustomerDashboards($event, item);
+            },
+            name: function() { return $translate.instant('dashboard.dashboards') },
+            details: function() { return $translate.instant('customer.manage-customer-dashboards') },
+            icon: "dashboard"
+        },
+        {
+            onAction: function ($event, item) {
+                vm.grid.deleteItem($event, item);
+            },
+            name: function() { return $translate.instant('action.delete') },
+            details: function() { return $translate.instant('customer.delete') },
+            icon: "delete"
+        }
+    ];
+
+    var vm = this;
+
+    vm.customerGridConfig = {
+
+        refreshParamsFunc: null,
+
+        deleteItemTitleFunc: deleteCustomerTitle,
+        deleteItemContentFunc: deleteCustomerText,
+        deleteItemsTitleFunc: deleteCustomersTitle,
+        deleteItemsActionTitleFunc: deleteCustomersActionTitle,
+        deleteItemsContentFunc: deleteCustomersText,
+
+        fetchItemsFunc: fetchCustomers,
+        saveItemFunc: saveCustomer,
+        deleteItemFunc: deleteCustomer,
+
+        getItemTitleFunc: getCustomerTitle,
+
+        itemCardTemplateUrl: customerCard,
+
+        actionsList: customerActionsList,
+
+        onGridInited: gridInited,
+
+        addItemTemplateUrl: addCustomerTemplate,
+
+        addItemText: function() { return $translate.instant('customer.add-customer-text') },
+        noItemsText: function() { return $translate.instant('customer.no-customers-text') },
+        itemDetailsText: function() { return $translate.instant('customer.customer-details') }
+    };
+
+    if (angular.isDefined($stateParams.items) && $stateParams.items !== null) {
+        vm.customerGridConfig.items = $stateParams.items;
+    }
+
+    if (angular.isDefined($stateParams.topIndex) && $stateParams.topIndex > 0) {
+        vm.customerGridConfig.topIndex = $stateParams.topIndex;
+    }
+
+    vm.openCustomerUsers = openCustomerUsers;
+    vm.openCustomerDevices = openCustomerDevices;
+    vm.openCustomerDashboards = openCustomerDashboards;
+
+    function deleteCustomerTitle(customer) {
+        return $translate.instant('customer.delete-customer-title', {customerTitle: customer.title});
+    }
+
+    function deleteCustomerText() {
+        return $translate.instant('customer.delete-customer-text');
+    }
+
+    function deleteCustomersTitle(selectedCount) {
+        return $translate.instant('customer.delete-customers-title', {count: selectedCount}, 'messageformat');
+    }
+
+    function deleteCustomersActionTitle(selectedCount) {
+        return $translate.instant('customer.delete-customers-action-title', {count: selectedCount}, 'messageformat');
+    }
+
+    function deleteCustomersText() {
+        return $translate.instant('customer.delete-customers-text');
+    }
+
+    function gridInited(grid) {
+        vm.grid = grid;
+    }
+
+    function fetchCustomers(pageLink) {
+        return customerService.getCustomers(pageLink);
+    }
+
+    function saveCustomer(customer) {
+        return customerService.saveCustomer(customer);
+    }
+
+    function deleteCustomer(customerId) {
+        return customerService.deleteCustomer(customerId);
+    }
+
+    function getCustomerTitle(customer) {
+        return customer ? customer.title : '';
+    }
+
+    function openCustomerUsers($event, customer) {
+        if ($event) {
+            $event.stopPropagation();
+        }
+        $state.go('home.customers.users', {customerId: customer.id.id});
+    }
+
+    function openCustomerDevices($event, customer) {
+        if ($event) {
+            $event.stopPropagation();
+        }
+        $state.go('home.customers.devices', {customerId: customer.id.id});
+    }
+
+    function openCustomerDashboards($event, customer) {
+        if ($event) {
+            $event.stopPropagation();
+        }
+        $state.go('home.customers.dashboards', {customerId: customer.id.id});
+    }
+}

diff --git a/ui/src/app/customer/customer.directive.js b/ui/src/app/customer/customer.directive.js
new file mode 100644
index 0000000..21ca44c
--- /dev/null
+++ b/ui/src/app/customer/customer.directive.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import customerFieldsetTemplate from './customer-fieldset.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function CustomerDirective($compile, $templateCache) {
+    var linker = function (scope, element) {
+        var template = $templateCache.get(customerFieldsetTemplate);
+        element.html(template);
+        $compile(element.contents())(scope);
+    }
+    return {
+        restrict: "E",
+        link: linker,
+        scope: {
+            customer: '=',
+            isEdit: '=',
+            theForm: '=',
+            onManageUsers: '&',
+            onManageDevices: '&',
+            onManageDashboards: '&',
+            onDeleteCustomer: '&'
+        }
+    };
+}

diff --git a/ui/src/app/customer/customer.routes.js b/ui/src/app/customer/customer.routes.js
new file mode 100644
index 0000000..bf0f27d
--- /dev/null
+++ b/ui/src/app/customer/customer.routes.js
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import customersTemplate from './customers.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function CustomerRoutes($stateProvider) {
+
+    $stateProvider
+        .state('home.customers', {
+            url: '/customers',
+            params: {'topIndex': 0},
+            module: 'private',
+            auth: ['TENANT_ADMIN'],
+            views: {
+                "content@home": {
+                    templateUrl: customersTemplate,
+                    controllerAs: 'vm',
+                    controller: 'CustomerController'
+                }
+            },
+            data: {
+                searchEnabled: true,
+                pageTitle: 'customer.customers'
+            },
+            ncyBreadcrumb: {
+                label: '{"icon": "supervisor_account", "label": "customer.customers"}'
+            }
+        });
+
+}

diff --git a/ui/src/app/customer/customer-card.tpl.html b/ui/src/app/customer/customer-card.tpl.html
new file mode 100644
index 0000000..99071bd
--- /dev/null
+++ b/ui/src/app/customer/customer-card.tpl.html
@@ -0,0 +1,18 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div class="tb-uppercase">{{ item | contactShort }}</div>
\ No newline at end of file

diff --git a/ui/src/app/customer/customer-fieldset.tpl.html b/ui/src/app/customer/customer-fieldset.tpl.html
new file mode 100644
index 0000000..dcecc2b
--- /dev/null
+++ b/ui/src/app/customer/customer-fieldset.tpl.html
@@ -0,0 +1,38 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-button ng-click="onManageUsers({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-users' | translate }}</md-button>
+<md-button ng-click="onManageDevices({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-devices' | translate }}</md-button>
+<md-button ng-click="onManageDashboards({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.manage-dashboards' | translate }}</md-button>
+<md-button ng-click="onDeleteCustomer({event: $event})" ng-show="!isEdit" class="md-raised md-primary">{{ 'customer.delete' | translate }}</md-button>
+
+<md-content class="md-padding" layout="column">
+	<fieldset ng-disabled="loading || !isEdit">
+		<md-input-container class="md-block">
+			<label translate>customer.title</label>
+			<input required name="title" ng-model="customer.title">	
+			<div ng-messages="theForm.title.$error">
+	      		<div translate ng-message="required">customer.title-required</div>
+	    	</div>				
+		</md-input-container>
+		<md-input-container class="md-block">
+			<label translate>customer.description</label>
+			<textarea ng-model="customer.additionalInfo.description" rows="2"></textarea>
+		</md-input-container>
+		<tb-contact contact="customer" the-form="theForm" is-edit="isEdit"></tb-contact>
+	</fieldset>
+</md-content>

diff --git a/ui/src/app/customer/customers.tpl.html b/ui/src/app/customer/customers.tpl.html
new file mode 100644
index 0000000..a8b8aac
--- /dev/null
+++ b/ui/src/app/customer/customers.tpl.html
@@ -0,0 +1,29 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<tb-grid grid-configuration="vm.customerGridConfig">
+	<details-buttons tb-help="'customers'" help-container-id="help-container">
+		<div id="help-container"></div>
+	</details-buttons>
+	<tb-customer customer="vm.grid.operatingItem()"
+			is-edit="vm.grid.detailsConfig.isDetailsEditMode"
+			the-form="vm.grid.detailsForm"
+			on-manage-users="vm.openCustomerUsers(event, vm.grid.detailsConfig.currentItem)"
+			on-manage-devices="vm.openCustomerDevices(event, vm.grid.detailsConfig.currentItem)"
+			on-manage-dashboards="vm.openCustomerDashboards(event, vm.grid.detailsConfig.currentItem)"
+			on-delete-customer="vm.grid.deleteItem(event, vm.grid.detailsConfig.currentItem)"></tb-customer>
+</tb-grid>

diff --git a/ui/src/app/customer/index.js b/ui/src/app/customer/index.js
new file mode 100644
index 0000000..08a1c19
--- /dev/null
+++ b/ui/src/app/customer/index.js
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import uiRouter from 'angular-ui-router';
+import thingsboardApiCustomer from '../api/customer.service';
+import thingsboardGrid from '../components/grid.directive';
+import thingsboardContact from '../components/contact.directive';
+import thingsboardContactShort from '../components/contact-short.filter';
+
+import CustomerRoutes from './customer.routes';
+import CustomerController from './customer.controller';
+import CustomerDirective from './customer.directive';
+
+export default angular.module('thingsboard.customer', [
+    uiRouter,
+    thingsboardApiCustomer,
+    thingsboardGrid,
+    thingsboardContact,
+    thingsboardContactShort
+])
+    .config(CustomerRoutes)
+    .controller('CustomerController', CustomerController)
+    .directive('tbCustomer', CustomerDirective)
+    .name;

diff --git a/ui/src/app/dashboard/add-dashboard.tpl.html b/ui/src/app/dashboard/add-dashboard.tpl.html
new file mode 100644
index 0000000..516f396
--- /dev/null
+++ b/ui/src/app/dashboard/add-dashboard.tpl.html
@@ -0,0 +1,45 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-dialog aria-label="{{ 'dashboard.add' | translate }}" tb-help="'dashboards'" help-container-id="help-container">
+	<form name="theForm" ng-submit="vm.add()">
+	    <md-toolbar>
+	      <div class="md-toolbar-tools">
+	        <h2 translate>dashboard.add</h2>
+	        <span flex></span>
+			<div id="help-container"></div>
+	        <md-button class="md-icon-button" ng-click="vm.cancel()">
+	          <ng-md-icon icon="close" aria-label="{{ 'dialog.close' | translate }}"></ng-md-icon>
+	        </md-button>
+	      </div>
+	    </md-toolbar>
+   	    <md-progress-linear class="md-warn" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+  	    <span style="min-height: 5px;" flex="" ng-show="!loading"></span>
+	    <md-dialog-content>
+	      <div class="md-dialog-content">
+  	        	<tb-dashboard-details dashboard="vm.item" is-edit="true" the-form="theForm"></tb-dashboard-details>
+	      </div>
+	    </md-dialog-content>
+	    <md-dialog-actions layout="row">
+	      <span flex></span>
+		  <md-button ng-disabled="loading || theForm.$invalid || !theForm.$dirty" type="submit" class="md-raised md-primary">
+			  {{ 'action.add' | translate }}
+		  </md-button>
+	      <md-button ng-disabled="loading" ng-click="vm.cancel()" style="margin-right:20px;">{{ 'action.cancel' | translate }}</md-button>
+	    </md-dialog-actions>
+	</form>    
+</md-dialog>
\ No newline at end of file

diff --git a/ui/src/app/dashboard/add-dashboards-to-customer.controller.js b/ui/src/app/dashboard/add-dashboards-to-customer.controller.js
new file mode 100644
index 0000000..4a360b7
--- /dev/null
+++ b/ui/src/app/dashboard/add-dashboards-to-customer.controller.js
@@ -0,0 +1,122 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*@ngInject*/
+export default function AddDashboardsToCustomerController(dashboardService, $mdDialog, $q, customerId, dashboards) {
+
+    var vm = this;
+
+    vm.dashboards = dashboards;
+    vm.searchText = '';
+
+    vm.assign = assign;
+    vm.cancel = cancel;
+    vm.hasData = hasData;
+    vm.noData = noData;
+    vm.searchDashboardTextUpdated = searchDashboardTextUpdated;
+    vm.toggleDashboardSelection = toggleDashboardSelection;
+
+    vm.theDashboards = {
+        getItemAtIndex: function (index) {
+            if (index > vm.dashboards.data.length) {
+                vm.theDashboards.fetchMoreItems_(index);
+                return null;
+            }
+            var item = vm.dashboards.data[index];
+            if (item) {
+                item.indexNumber = index + 1;
+            }
+            return item;
+        },
+
+        getLength: function () {
+            if (vm.dashboards.hasNext) {
+                return vm.dashboards.data.length + vm.dashboards.nextPageLink.limit;
+            } else {
+                return vm.dashboards.data.length;
+            }
+        },
+
+        fetchMoreItems_: function () {
+            if (vm.dashboards.hasNext && !vm.dashboards.pending) {
+                vm.dashboards.pending = true;
+                dashboardService.getTenantDashboards(vm.dashboards.nextPageLink).then(
+                    function success(dashboards) {
+                        vm.dashboards.data = vm.dashboards.data.concat(dashboards.data);
+                        vm.dashboards.nextPageLink = dashboards.nextPageLink;
+                        vm.dashboards.hasNext = dashboards.hasNext;
+                        if (vm.dashboards.hasNext) {
+                            vm.dashboards.nextPageLink.limit = vm.dashboards.pageSize;
+                        }
+                        vm.dashboards.pending = false;
+                    },
+                    function fail() {
+                        vm.dashboards.hasNext = false;
+                        vm.dashboards.pending = false;
+                    });
+            }
+        }
+    }
+
+    function cancel () {
+        $mdDialog.cancel();
+    }
+
+    function assign () {
+        var tasks = [];
+        for (var dashboardId in vm.dashboards.selections) {
+            tasks.push(dashboardService.assignDashboardToCustomer(customerId, dashboardId));
+        }
+        $q.all(tasks).then(function () {
+            $mdDialog.hide();
+        });
+    }
+
+    function noData () {
+        return vm.dashboards.data.length == 0 && !vm.dashboards.hasNext;
+    }
+
+    function hasData () {
+        return vm.dashboards.data.length > 0;
+    }
+
+    function toggleDashboardSelection ($event, dashboard) {
+        $event.stopPropagation();
+        var selected = angular.isDefined(dashboard.selected) && dashboard.selected;
+        dashboard.selected = !selected;
+        if (dashboard.selected) {
+            vm.dashboards.selections[dashboard.id.id] = true;
+            vm.dashboards.selectedCount++;
+        } else {
+            delete vm.dashboards.selections[dashboard.id.id];
+            vm.dashboards.selectedCount--;
+        }
+    }
+
+    function searchDashboardTextUpdated () {
+        vm.dashboards = {
+            pageSize: vm.dashboards.pageSize,
+            data: [],
+            nextPageLink: {
+                limit: vm.dashboards.pageSize,
+                textSearch: vm.searchText
+            },
+            selections: {},
+            selectedCount: 0,
+            hasNext: true,
+            pending: false
+        };
+    }
+}
\ No newline at end of file

diff --git a/ui/src/app/dashboard/add-dashboards-to-customer.tpl.html b/ui/src/app/dashboard/add-dashboards-to-customer.tpl.html
new file mode 100644
index 0000000..f258a9b
--- /dev/null
+++ b/ui/src/app/dashboard/add-dashboards-to-customer.tpl.html
@@ -0,0 +1,77 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-dialog aria-label="{{ 'dashboard.assign-dashboard-to-customer' | translate }}">
+    <form name="theForm" ng-submit="vm.assign()">
+        <md-toolbar>
+            <div class="md-toolbar-tools">
+                <h2 translate>dashboard.assign-dashboard-to-customer</h2>
+                <span flex></span>
+                <md-button class="md-icon-button" ng-click="vm.cancel()">
+                    <ng-md-icon icon="close" aria-label="{{ 'dialog.close' | translate }}"></ng-md-icon>
+                </md-button>
+            </div>
+        </md-toolbar>
+        <md-progress-linear class="md-warn" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+        <span style="min-height: 5px;" flex="" ng-show="!loading"></span>
+        <md-dialog-content>
+            <div class="md-dialog-content">
+                <fieldset>
+                    <span translate>dashboard.assign-dashboard-to-customer-text</span>
+                    <md-input-container class="md-block" style='margin-bottom: 0px;'>
+                        <label>&nbsp;</label>
+                        <md-icon aria-label="{{ 'action.search' | translate }}" class="material-icons">
+                            search
+                        </md-icon>
+                        <input id="dashboard-search" autofocus ng-model="vm.searchText"
+                               ng-change="vm.searchDashboardTextUpdated()"
+                               placeholder="{{ 'common.enter-search' | translate }}"/>
+                    </md-input-container>
+                    <div style='min-height: 150px;'>
+					<span translate layout-align="center center"
+                          style="text-transform: uppercase; display: flex; height: 150px;"
+                          class="md-subhead"
+                          ng-show="vm.noData()">dashboard.no-dashboards-text</span>
+                        <md-virtual-repeat-container ng-show="vm.hasData()"
+                                                     tb-scope-element="repeatContainer" md-top-index="vm.topIndex" flex
+                                                     style='min-height: 150px; width: 100%;'>
+                            <md-list>
+                                <md-list-item md-virtual-repeat="dashboard in vm.theDashboards" md-on-demand
+                                              class="repeated-item" flex>
+                                    <md-checkbox ng-click="vm.toggleDashboardSelection($event, dashboard)"
+                                                 aria-label="{{ 'item.selected' | translate }}"
+                                                 ng-checked="dashboard.selected"></md-checkbox>
+                                    <span> {{ dashboard.title }} </span>
+                                </md-list-item>
+                            </md-list>
+                        </md-virtual-repeat-container>
+                    </div>
+                </fieldset>
+            </div>
+        </md-dialog-content>
+        <md-dialog-actions layout="row">
+            <span flex></span>
+            <md-button ng-disabled="loading || vm.dashboards.selectedCount == 0" type="submit"
+                       class="md-raised md-primary">
+                {{ 'action.assign' | translate }}
+            </md-button>
+            <md-button ng-disabled="loading" ng-click="vm.cancel()" style="margin-right:20px;">{{ 'action.cancel' |
+                translate }}
+            </md-button>
+        </md-dialog-actions>
+    </form>
+</md-dialog>
\ No newline at end of file

diff --git a/ui/src/app/dashboard/add-widget.controller.js b/ui/src/app/dashboard/add-widget.controller.js
new file mode 100644
index 0000000..ec77404
--- /dev/null
+++ b/ui/src/app/dashboard/add-widget.controller.js
@@ -0,0 +1,124 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import deviceAliasesTemplate from './device-aliases.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function AddWidgetController($scope, widgetService, deviceService, $mdDialog, $q, $document, types, dashboard, widget, widgetInfo) {
+
+    var vm = this;
+
+    vm.dashboard = dashboard;
+    vm.widget = widget;
+    vm.widgetInfo = widgetInfo;
+
+    vm.functionsOnly = false;
+
+    vm.helpLinkIdForWidgetType = helpLinkIdForWidgetType;
+    vm.add = add;
+    vm.cancel = cancel;
+    vm.fetchDeviceKeys = fetchDeviceKeys;
+    vm.createDeviceAlias = createDeviceAlias;
+
+    vm.widgetConfig = vm.widget.config;
+    var settingsSchema = vm.widgetInfo.settingsSchema;
+    var dataKeySettingsSchema = vm.widgetInfo.dataKeySettingsSchema;
+    if (!settingsSchema || settingsSchema === '') {
+        vm.settingsSchema = {};
+    } else {
+        vm.settingsSchema = angular.fromJson(settingsSchema);
+    }
+    if (!dataKeySettingsSchema || dataKeySettingsSchema === '') {
+        vm.dataKeySettingsSchema = {};
+    } else {
+        vm.dataKeySettingsSchema = angular.fromJson(dataKeySettingsSchema);
+    }
+
+    function helpLinkIdForWidgetType() {
+        var link = 'widgetsConfig';
+        if (vm.widget && vm.widget.type) {
+            switch (vm.widget.type) {
+                case types.widgetType.timeseries.value: {
+                    link = 'widgetsConfigTimeseries';
+                    break;
+                }
+                case types.widgetType.latest.value: {
+                    link = 'widgetsConfigLatest';
+                    break;
+                }
+                case types.widgetType.rpc.value: {
+                    link = 'widgetsConfigRpc';
+                    break;
+                }
+            }
+        }
+        return link;
+    }
+
+    function cancel () {
+        $mdDialog.cancel();
+    }
+
+    function add () {
+        if ($scope.theForm.$valid) {
+            $scope.theForm.$setPristine();
+            vm.widget.config = vm.widgetConfig;
+            $mdDialog.hide(vm.widget);
+        }
+    }
+
+    function fetchDeviceKeys (deviceAliasId, query, type) {
+        var deviceAlias = vm.dashboard.configuration.deviceAliases[deviceAliasId];
+        if (deviceAlias && deviceAlias.deviceId) {
+            return deviceService.getDeviceKeys(deviceAlias.deviceId, query, type);
+        } else {
+            return $q.when([]);
+        }
+    }
+
+    function createDeviceAlias (event, alias) {
+
+        var deferred = $q.defer();
+        var singleDeviceAlias = {id: null, alias: alias, deviceId: null};
+
+        $mdDialog.show({
+            controller: 'DeviceAliasesController',
+            controllerAs: 'vm',
+            templateUrl: deviceAliasesTemplate,
+            locals: {
+                deviceAliases: angular.copy(vm.dashboard.configuration.deviceAliases),
+                aliasToWidgetsMap: null,
+                isSingleDevice: true,
+                singleDeviceAlias: singleDeviceAlias
+            },
+            parent: angular.element($document[0].body),
+            fullscreen: true,
+            skipHide: true,
+            targetEvent: event
+        }).then(function (singleDeviceAlias) {
+            vm.dashboard.configuration.deviceAliases[singleDeviceAlias.id] =
+                { alias: singleDeviceAlias.alias, deviceId: singleDeviceAlias.deviceId };
+            deferred.resolve(singleDeviceAlias);
+        }, function () {
+            deferred.reject();
+        });
+
+        return deferred.promise;
+    }
+}

diff --git a/ui/src/app/dashboard/add-widget.tpl.html b/ui/src/app/dashboard/add-widget.tpl.html
new file mode 100644
index 0000000..aefcdaf
--- /dev/null
+++ b/ui/src/app/dashboard/add-widget.tpl.html
@@ -0,0 +1,59 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-dialog aria-label="{{ 'widget.add' | translate }}" style="width: 900px;" tb-help="vm.helpLinkIdForWidgetType()" help-container-id="help-container">
+    <form name="theForm" ng-submit="vm.add()">
+        <md-toolbar>
+            <div class="md-toolbar-tools">
+                <h2 translate>widget.add</h2>
+                <span flex></span>
+                <div id="help-container"></div>
+                <md-button class="md-icon-button" ng-click="vm.cancel()">
+                    <ng-md-icon icon="close" aria-label="{{ 'dialog.close' | translate }}"></ng-md-icon>
+                </md-button>
+            </div>
+        </md-toolbar>
+        <md-progress-linear class="md-warn" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+        <span style="min-height: 5px;" flex="" ng-show="!loading"></span>
+        <md-dialog-content>
+            <div class="md-dialog-content" style="padding-top: 0px;">
+                <fieldset ng-disabled="loading" style="position: relative; height: 600px;">
+                    <tb-widget-config widget-type="vm.widget.type"
+                                      force-expand-datasources="true"
+                                      ng-model="vm.widgetConfig"
+                                      widget-settings-schema="vm.settingsSchema"
+                                      datakey-settings-schema="vm.dataKeySettingsSchema"
+                                      device-aliases="vm.dashboard.configuration.deviceAliases"
+                                      functions-only="vm.functionsOnly"
+                                      fetch-device-keys="vm.fetchDeviceKeys(deviceAliasId, query, type)"
+                                      on-create-device-alias="vm.createDeviceAlias(event, alias)"
+                                      the-form="theForm"></tb-widget-config>
+                </fieldset>
+            </div>
+        </md-dialog-content>
+        <md-dialog-actions layout="row">
+            <span flex></span>
+            <md-button ng-disabled="loading || theForm.$invalid" type="submit"
+                       class="md-raised md-primary">
+                {{ 'action.add' | translate }}
+            </md-button>
+            <md-button ng-disabled="loading" ng-click="vm.cancel()" style="margin-right:20px;">{{ 'action.cancel' |
+                translate }}
+            </md-button>
+        </md-dialog-actions>
+    </form>
+</md-dialog>

diff --git a/ui/src/app/dashboard/assign-to-customer.controller.js b/ui/src/app/dashboard/assign-to-customer.controller.js
new file mode 100644
index 0000000..a5ca3cb
--- /dev/null
+++ b/ui/src/app/dashboard/assign-to-customer.controller.js
@@ -0,0 +1,123 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/*@ngInject*/
+export default function AssignDashboardToCustomerController(customerService, dashboardService, $mdDialog, $q, dashboardIds, customers) {
+
+    var vm = this;
+
+    vm.customers = customers;
+    vm.searchText = '';
+
+    vm.assign = assign;
+    vm.cancel = cancel;
+    vm.isCustomerSelected = isCustomerSelected;
+    vm.hasData = hasData;
+    vm.noData = noData;
+    vm.searchCustomerTextUpdated = searchCustomerTextUpdated;
+    vm.toggleCustomerSelection = toggleCustomerSelection;
+
+    vm.theCustomers = {
+        getItemAtIndex: function (index) {
+            if (index > vm.customers.data.length) {
+                vm.theCustomers.fetchMoreItems_(index);
+                return null;
+            }
+            var item = vm.customers.data[index];
+            if (item) {
+                item.indexNumber = index + 1;
+            }
+            return item;
+        },
+
+        getLength: function () {
+            if (vm.customers.hasNext) {
+                return vm.customers.data.length + vm.customers.nextPageLink.limit;
+            } else {
+                return vm.customers.data.length;
+            }
+        },
+
+        fetchMoreItems_: function () {
+            if (vm.customers.hasNext && !vm.customers.pending) {
+                vm.customers.pending = true;
+                customerService.getCustomers(vm.customers.nextPageLink).then(
+                    function success(customers) {
+                        vm.customers.data = vm.customers.data.concat(customers.data);
+                        vm.customers.nextPageLink = customers.nextPageLink;
+                        vm.customers.hasNext = customers.hasNext;
+                        if (vm.customers.hasNext) {
+                            vm.customers.nextPageLink.limit = vm.customers.pageSize;
+                        }
+                        vm.customers.pending = false;
+                    },
+                    function fail() {
+                        vm.customers.hasNext = false;
+                        vm.customers.pending = false;
+                    });
+            }
+        }
+    };
+
+    function cancel () {
+        $mdDialog.cancel();
+    }
+
+    function assign () {
+        var tasks = [];
+        for (var dashboardId in dashboardIds) {
+            tasks.push(dashboardService.assignDashboardToCustomer(vm.customers.selection.id.id, dashboardIds[dashboardId]));
+        }
+        $q.all(tasks).then(function () {
+            $mdDialog.hide();
+        });
+    }
+
+    function noData () {
+        return vm.customers.data.length == 0 && !vm.customers.hasNext;
+    }
+
+    function hasData () {
+        return vm.customers.data.length > 0;
+    }
+
+    function toggleCustomerSelection ($event, customer) {
+        $event.stopPropagation();
+        if (vm.isCustomerSelected(customer)) {
+            vm.customers.selection = null;
+        } else {
+            vm.customers.selection = customer;
+        }
+    }
+
+    function isCustomerSelected (customer) {
+        return vm.customers.selection != null && customer &&
+            customer.id.id === vm.customers.selection.id.id;
+    }
+
+    function searchCustomerTextUpdated () {
+        vm.customers = {
+            pageSize: vm.customers.pageSize,
+            data: [],
+            nextPageLink: {
+                limit: vm.customers.pageSize,
+                textSearch: vm.searchText
+            },
+            selection: null,
+            hasNext: true,
+            pending: false
+        };
+    }
+}

diff --git a/ui/src/app/dashboard/assign-to-customer.tpl.html b/ui/src/app/dashboard/assign-to-customer.tpl.html
new file mode 100644
index 0000000..dd539fa
--- /dev/null
+++ b/ui/src/app/dashboard/assign-to-customer.tpl.html
@@ -0,0 +1,76 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-dialog aria-label="{{ 'dashboard.assign-dashboard-to-customer' | translate }}">
+    <form name="theForm" ng-submit="vm.assign()">
+        <md-toolbar>
+            <div class="md-toolbar-tools">
+                <h2 translate>dashboard.assign-dashboard-to-customer</h2>
+                <span flex></span>
+                <md-button class="md-icon-button" ng-click="vm.cancel()">
+                    <ng-md-icon icon="close" aria-label="{{ 'dialog.close' | translate }}"></ng-md-icon>
+                </md-button>
+            </div>
+        </md-toolbar>
+        <md-progress-linear class="md-warn" md-mode="indeterminate" ng-show="loading"></md-progress-linear>
+        <span style="min-height: 5px;" flex="" ng-show="!loading"></span>
+        <md-dialog-content>
+            <div class="md-dialog-content">
+                <fieldset>
+                    <span translate>dashboard.assign-to-customer-text</span>
+                    <md-input-container class="md-block" style='margin-bottom: 0px;'>
+                        <label>&nbsp;</label>
+                        <md-icon aria-label="{{ 'action.search' | translate }}" class="material-icons">
+                            search
+                        </md-icon>
+                        <input id="customer-search" autofocus ng-model="vm.searchText"
+                               ng-change="vm.searchCustomerTextUpdated()"
+                               placeholder="{{ 'common.enter-search' | translate }}"/>
+                    </md-input-container>
+                    <div style='min-height: 150px;'>
+					<span translate layout-align="center center"
+                          style="text-transform: uppercase; display: flex; height: 150px;"
+                          class="md-subhead"
+                          ng-show="vm.noData()">customer.no-customers-text</span>
+                        <md-virtual-repeat-container ng-show="vm.hasData()"
+                                                     tb-scope-element="repeatContainer" md-top-index="vm.topIndex" flex
+                                                     style='min-height: 150px; width: 100%;'>
+                            <md-list>
+                                <md-list-item md-virtual-repeat="customer in vm.theCustomers" md-on-demand
+                                              class="repeated-item" flex>
+                                    <md-checkbox ng-click="vm.toggleCustomerSelection($event, customer)"
+                                                 aria-label="{{ 'item.selected' | translate }}"
+                                                 ng-checked="vm.isCustomerSelected(customer)"></md-checkbox>
+                                    <span> {{ customer.title }} </span>
+                                </md-list-item>
+                            </md-list>
+                        </md-virtual-repeat-container>
+                    </div>
+                </fieldset>
+            </div>
+        </md-dialog-content>
+        <md-dialog-actions layout="row">
+            <span flex></span>
+            <md-button ng-disabled="loading || vm.customers.selection==null" type="submit" class="md-raised md-primary">
+                {{ 'action.assign' | translate }}
+            </md-button>
+            <md-button ng-disabled="loading" ng-click="vm.cancel()" style="margin-right:20px;">{{ 'action.cancel' |
+                translate }}
+            </md-button>
+        </md-dialog-actions>
+    </form>
+</md-dialog>
\ No newline at end of file

diff --git a/ui/src/app/dashboard/dashboard.controller.js b/ui/src/app/dashboard/dashboard.controller.js
new file mode 100644
index 0000000..18c2b5f
--- /dev/null
+++ b/ui/src/app/dashboard/dashboard.controller.js
@@ -0,0 +1,424 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import deviceAliasesTemplate from './device-aliases.tpl.html';
+import addWidgetTemplate from './add-widget.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function DashboardController(types, widgetService, userService,
+                                            dashboardService, $window, $rootScope,
+                                            $scope, $state, $stateParams, $mdDialog, $timeout, $document, $q, $translate, $filter) {
+
+    var user = userService.getCurrentUser();
+
+    var vm = this;
+
+    vm.dashboard = null;
+    vm.editingWidget = null;
+    vm.editingWidgetIndex = null;
+    vm.editingWidgetSubtitle = null;
+    vm.forceDashboardMobileMode = false;
+    vm.isAddingWidget = false;
+    vm.isEdit = false;
+    vm.isEditingWidget = false;
+    vm.latestWidgetTypes = [];
+    vm.timeseriesWidgetTypes = [];
+    vm.rpcWidgetTypes = [];
+    vm.widgetEditMode = $state.$current.data.widgetEditMode;
+    vm.widgets = [];
+
+    vm.addWidget = addWidget;
+    vm.addWidgetFromType = addWidgetFromType;
+    vm.dashboardInited = dashboardInited;
+    vm.dashboardInitFailed = dashboardInitFailed;
+    vm.widgetClicked = widgetClicked;
+    vm.editWidget = editWidget;
+    vm.isTenantAdmin = isTenantAdmin;
+    vm.loadDashboard = loadDashboard;
+    vm.noData = noData;
+    vm.onAddWidgetClosed = onAddWidgetClosed;
+    vm.onEditWidgetClosed = onEditWidgetClosed;
+    vm.openDeviceAliases = openDeviceAliases;
+    vm.removeWidget = removeWidget;
+    vm.saveDashboard = saveDashboard;
+    vm.saveWidget = saveWidget;
+    vm.toggleDashboardEditMode = toggleDashboardEditMode;
+    vm.onRevertWidgetEdit = onRevertWidgetEdit;
+    vm.helpLinkIdForWidgetType = helpLinkIdForWidgetType;
+
+    vm.widgetsBundle;
+
+    $scope.$watch('vm.widgetsBundle', function (newVal, prevVal) {
+        if (newVal !== prevVal && !vm.widgetEditMode) {
+            loadWidgetLibrary();
+        }
+    });
+
+    function loadWidgetLibrary() {
+        vm.latestWidgetTypes = [];
+        vm.timeseriesWidgetTypes = [];
+        vm.rpcWidgetTypes = [];
+        if (vm.widgetsBundle) {
+            var bundleAlias = vm.widgetsBundle.alias;
+            var isSystem = vm.widgetsBundle.tenantId.id === types.id.nullUid;
+
+            widgetService.getBundleWidgetTypes(bundleAlias, isSystem).then(
+                function (widgetTypes) {
+
+                    widgetTypes = $filter('orderBy')(widgetTypes, ['-name']);
+
+                    var top = 0;
+                    var sizeY = 0;
+
+                    if (widgetTypes.length > 0) {
+                        loadNext(0);
+                    }
+
+                    function loadNextOrComplete(i) {
+                        i++;
+                        if (i < widgetTypes.length) {
+                            loadNext(i);
+                        }
+                    }
+
+                    function loadNext(i) {
+                        var widgetType = widgetTypes[i];
+                        var widgetTypeInfo = widgetService.toWidgetInfo(widgetType);
+                        var widget = {
+                            isSystemType: isSystem,
+                            bundleAlias: bundleAlias,
+                            typeAlias: widgetTypeInfo.alias,
+                            type: widgetTypeInfo.type,
+                            title: widgetTypeInfo.widgetName,
+                            sizeX: widgetTypeInfo.sizeX,
+                            sizeY: widgetTypeInfo.sizeY,
+                            row: top,
+                            col: 0,
+                            config: angular.fromJson(widgetTypeInfo.defaultConfig)
+                        };
+                        widget.config.title = widgetTypeInfo.widgetName;
+                        if (widgetTypeInfo.type === types.widgetType.timeseries.value) {
+                            vm.timeseriesWidgetTypes.push(widget);
+                        } else if (widgetTypeInfo.type === types.widgetType.latest.value) {
+                            vm.latestWidgetTypes.push(widget);
+                        } else if (widgetTypeInfo.type === types.widgetType.rpc.value) {
+                            vm.rpcWidgetTypes.push(widget);
+                        }
+                        top += sizeY;
+                        loadNextOrComplete(i);
+
+                    }
+                }
+            );
+        }
+    }
+
+    function loadDashboard() {
+
+        var deferred = $q.defer();
+
+        if (vm.widgetEditMode) {
+            $timeout(function () {
+                vm.widgets = [{
+                    isSystemType: true,
+                    bundleAlias: 'customWidgetBundle',
+                    typeAlias: 'customWidget',
+                    type: $rootScope.editWidgetInfo.type,
+                    title: 'My widget',
+                    sizeX: $rootScope.editWidgetInfo.sizeX * 2,
+                    sizeY: $rootScope.editWidgetInfo.sizeY * 2,
+                    row: 2,
+                    col: 4,
+                    config: angular.fromJson($rootScope.editWidgetInfo.defaultConfig)
+                }];
+                vm.widgets[0].config.title = vm.widgets[0].config.title || $rootScope.editWidgetInfo.widgetName;
+                deferred.resolve();
+                var parentScope = $window.parent.angular.element($window.frameElement).scope();
+                parentScope.$root.$broadcast('widgetEditModeInited');
+                parentScope.$root.$apply();
+
+                $scope.$watch('vm.widgets', function () {
+                    var widget = vm.widgets[0];
+                    parentScope.$root.$broadcast('widgetEditUpdated', widget);
+                    parentScope.$root.$apply();
+                }, true);
+
+            });
+        } else {
+
+            dashboardService.getDashboard($stateParams.dashboardId)
+                .then(function success(dashboard) {
+                    vm.dashboard = dashboard;
+                    if (vm.dashboard.configuration == null) {
+                        vm.dashboard.configuration = {widgets: [], deviceAliases: {}};
+                    }
+                    if (angular.isUndefined(vm.dashboard.configuration.widgets)) {
+                        vm.dashboard.configuration.widgets = [];
+                    }
+                    if (angular.isUndefined(vm.dashboard.configuration.deviceAliases)) {
+                        vm.dashboard.configuration.deviceAliases = {};
+                    }
+                    vm.widgets = vm.dashboard.configuration.widgets;
+                    deferred.resolve();
+                }, function fail(e) {
+                    deferred.reject(e);
+                });
+
+        }
+        return deferred.promise;
+    }
+
+    function dashboardInitFailed() {
+        var parentScope = $window.parent.angular.element($window.frameElement).scope();
+        parentScope.$emit('widgetEditModeInited');
+        parentScope.$apply();
+    }
+
+    function dashboardInited(dashboard) {
+        vm.dashboardContainer = dashboard;
+    }
+
+    function isTenantAdmin() {
+        return user.authority === 'TENANT_ADMIN';
+    }
+
+    function noData() {
+        return vm.widgets.length == 0;
+    }
+
+    function openDeviceAliases($event) {
+        var aliasToWidgetsMap = {};
+        var widgetsTitleList;
+        for (var w in vm.widgets) {
+            var widget = vm.widgets[w];
+            if (widget.type === types.widgetType.rpc.value) {
+                if (widget.config.targetDeviceAliasIds && widget.config.targetDeviceAliasIds.length > 0) {
+                    var targetDeviceAliasId = widget.config.targetDeviceAliasIds[0];
+                    widgetsTitleList = aliasToWidgetsMap[targetDeviceAliasId];
+                    if (!widgetsTitleList) {
+                        widgetsTitleList = [];
+                        aliasToWidgetsMap[targetDeviceAliasId] = widgetsTitleList;
+                    }
+                    widgetsTitleList.push(widget.config.title);
+                }
+            } else {
+                for (var i in widget.config.datasources) {
+                    var datasource = widget.config.datasources[i];
+                    if (datasource.type === types.datasourceType.device && datasource.deviceAliasId) {
+                        widgetsTitleList = aliasToWidgetsMap[datasource.deviceAliasId];
+                        if (!widgetsTitleList) {
+                            widgetsTitleList = [];
+                            aliasToWidgetsMap[datasource.deviceAliasId] = widgetsTitleList;
+                        }
+                        widgetsTitleList.push(widget.config.title);
+                    }
+                }
+            }
+        }
+
+        $mdDialog.show({
+            controller: 'DeviceAliasesController',
+            controllerAs: 'vm',
+            templateUrl: deviceAliasesTemplate,
+            locals: {
+                deviceAliases: angular.copy(vm.dashboard.configuration.deviceAliases),
+                aliasToWidgetsMap: aliasToWidgetsMap,
+                isSingleDevice: false,
+                singleDeviceAlias: null
+            },
+            parent: angular.element($document[0].body),
+            skipHide: true,
+            fullscreen: true,
+            targetEvent: $event
+        }).then(function (deviceAliases) {
+            vm.dashboard.configuration.deviceAliases = deviceAliases;
+        }, function () {
+        });
+    }
+
+    function editWidget($event, widget) {
+        $event.stopPropagation();
+        var newEditingIndex = vm.widgets.indexOf(widget);
+        if (vm.editingWidgetIndex === newEditingIndex) {
+            $timeout(onEditWidgetClosed());
+        } else {
+            var transition = !vm.forceDashboardMobileMode;
+            vm.editingWidgetIndex = vm.widgets.indexOf(widget);
+            vm.editingWidget = angular.copy(widget);
+            vm.editingWidgetSubtitle = widgetService.getInstantWidgetInfo(vm.editingWidget).widgetName;
+            vm.forceDashboardMobileMode = true;
+            vm.isEditingWidget = true;
+
+            if (vm.dashboardContainer) {
+                var delayOffset = transition ? 350 : 0;
+                var delay = transition ? 400 : 300;
+                $timeout(function () {
+                    vm.dashboardContainer.highlightWidget(vm.editingWidgetIndex, delay);
+                }, delayOffset, false);
+            }
+        }
+    }
+
+    function widgetClicked($event, widget) {
+        if (vm.isEditingWidget) {
+            editWidget($event, widget);
+        }
+    }
+
+    function helpLinkIdForWidgetType() {
+        var link = 'widgetsConfig';
+        if (vm.editingWidget && vm.editingWidget.type) {
+            switch (vm.editingWidget.type) {
+                case types.widgetType.timeseries.value: {
+                    link = 'widgetsConfigTimeseries';
+                    break;
+                }
+                case types.widgetType.latest.value: {
+                    link = 'widgetsConfigLatest';
+                    break;
+                }
+                case types.widgetType.rpc.value: {
+                    link = 'widgetsConfigRpc';
+                    break;
+                }
+            }
+        }
+        return link;
+    }
+
+    function onRevertWidgetEdit(widgetForm) {
+        if (widgetForm.$dirty) {
+            widgetForm.$setPristine();
+            vm.editingWidget = angular.copy(vm.widgets[vm.editingWidgetIndex]);
+        }
+    }
+
+    function saveWidget(widgetForm) {
+        widgetForm.$setPristine();
+        vm.widgets[vm.editingWidgetIndex] = angular.copy(vm.editingWidget);
+    }
+
+    function onEditWidgetClosed() {
+        vm.editingWidgetIndex = null;
+        vm.editingWidget = null;
+        vm.editingWidgetSubtitle = null;
+        vm.isEditingWidget = false;
+        if (vm.dashboardContainer) {
+            vm.dashboardContainer.resetHighlight();
+        }
+        vm.forceDashboardMobileMode = false;
+    }
+
+    function addWidget() {
+        loadWidgetLibrary();
+        vm.isAddingWidget = true;
+    }
+
+    function onAddWidgetClosed() {
+        vm.timeseriesWidgetTypes = [];
+        vm.latestWidgetTypes = [];
+        vm.rpcWidgetTypes = [];
+    }
+
+    function addWidgetFromType(event, widget) {
+        vm.onAddWidgetClosed();
+        vm.isAddingWidget = false;
+        widgetService.getWidgetInfo(widget.bundleAlias, widget.typeAlias, widget.isSystemType).then(
+            function (widgetTypeInfo) {
+                var config = angular.fromJson(widgetTypeInfo.defaultConfig);
+                config.title = 'New ' + widgetTypeInfo.widgetName;
+                config.datasources = [];
+                var newWidget = {
+                    isSystemType: widget.isSystemType,
+                    bundleAlias: widget.bundleAlias,
+                    typeAlias: widgetTypeInfo.alias,
+                    type: widgetTypeInfo.type,
+                    title: 'New widget',
+                    sizeX: widgetTypeInfo.sizeX,
+                    sizeY: widgetTypeInfo.sizeY,
+                    config: config
+                };
+                $mdDialog.show({
+                    controller: 'AddWidgetController',
+                    controllerAs: 'vm',
+                    templateUrl: addWidgetTemplate,
+                    locals: {dashboard: vm.dashboard, widget: newWidget, widgetInfo: widgetTypeInfo},
+                    parent: angular.element($document[0].body),
+                    fullscreen: true,
+                    skipHide: true,
+                    targetEvent: event,
+                    onComplete: function () {
+                        var w = angular.element($window);
+                        w.triggerHandler('resize');
+                    }
+                }).then(function (widget) {
+                    vm.widgets.push(widget);
+                }, function () {
+                });
+            }
+        );
+    }
+
+    function removeWidget(event, widget) {
+        var title = widget.config.title;
+        if (!title || title.length === 0) {
+            title = widgetService.getInstantWidgetInfo(widget).widgetName;
+        }
+        var confirm = $mdDialog.confirm()
+            .targetEvent(event)
+            .title($translate.instant('widget.remove-widget-title', {widgetTitle: title}))
+            .htmlContent($translate.instant('widget.remove-widget-text'))
+            .ariaLabel($translate.instant('widget.remove'))
+            .cancel($translate.instant('action.no'))
+            .ok($translate.instant('action.yes'));
+        $mdDialog.show(confirm).then(function () {
+            vm.widgets.splice(vm.widgets.indexOf(widget), 1);
+        });
+    }
+
+    function toggleDashboardEditMode() {
+        vm.isEdit = !vm.isEdit;
+        if (vm.isEdit) {
+            if (vm.widgetEditMode) {
+                vm.prevWidgets = angular.copy(vm.widgets);
+            } else {
+                vm.prevDashboard = angular.copy(vm.dashboard);
+            }
+        } else {
+            if (vm.widgetEditMode) {
+                vm.widgets = vm.prevWidgets;
+            } else {
+                vm.dashboard = vm.prevDashboard;
+                vm.widgets = vm.dashboard.configuration.widgets;
+            }
+        }
+    }
+
+    function saveDashboard() {
+        vm.isEdit = false;
+        notifyDashboardUpdated();
+    }
+
+    function notifyDashboardUpdated() {
+        if (!vm.widgetEditMode) {
+            dashboardService.saveDashboard(vm.dashboard);
+        }
+    }
+
+}

diff --git a/ui/src/app/dashboard/dashboard.directive.js b/ui/src/app/dashboard/dashboard.directive.js
new file mode 100644
index 0000000..cd9243f
--- /dev/null
+++ b/ui/src/app/dashboard/dashboard.directive.js
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import dashboardFieldsetTemplate from './dashboard-fieldset.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function DashboardDirective($compile, $templateCache) {
+    var linker = function (scope, element) {
+        var template = $templateCache.get(dashboardFieldsetTemplate);
+        element.html(template);
+        $compile(element.contents())(scope);
+    }
+    return {
+        restrict: "E",
+        link: linker,
+        scope: {
+            dashboard: '=',
+            isEdit: '=',
+            dashboardScope: '=',
+            theForm: '=',
+            onAssignToCustomer: '&',
+            onUnassignFromCustomer: '&',
+            onDeleteDashboard: '&'
+        }
+    };
+}

diff --git a/ui/src/app/dashboard/dashboard.routes.js b/ui/src/app/dashboard/dashboard.routes.js
new file mode 100644
index 0000000..6c3012c
--- /dev/null
+++ b/ui/src/app/dashboard/dashboard.routes.js
@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+/* eslint-disable import/no-unresolved, import/default */
+
+import dashboardsTemplate from './dashboards.tpl.html';
+import dashboardTemplate from './dashboard.tpl.html';
+
+/* eslint-enable import/no-unresolved, import/default */
+
+/*@ngInject*/
+export default function DashboardRoutes($stateProvider) {
+    $stateProvider
+        .state('home.dashboards', {
+            url: '/dashboards',
+            params: {'topIndex': 0},
+            module: 'private',
+            auth: ['TENANT_ADMIN', 'CUSTOMER_USER'],
+            views: {
+                "content@home": {
+                    templateUrl: dashboardsTemplate,
+                    controller: 'DashboardsController',
+                    controllerAs: 'vm'
+                }
+            },
+            data: {
+                dashboardsType: 'tenant',
+                searchEnabled: true,
+                pageTitle: 'dashboard.dashboards'
+            },
+            ncyBreadcrumb: {
+                label: '{"icon": "dashboard", "label": "dashboard.dashboards"}'
+            }
+        })
+        .state('home.customers.dashboards', {
+            url: '/:customerId/dashboards',
+            params: {'topIndex': 0},
+            module: 'private',
+            auth: ['TENANT_ADMIN'],
+            views: {
+                "content@home": {
+                    templateUrl: dashboardsTemplate,
+                    controllerAs: 'vm',
+                    controller: 'DashboardsController'
+                }
+            },
+            data: {
+                dashboardsType: 'customer',
+                searchEnabled: true,
+                pageTitle: 'customer.dashboards'
+            },
+            ncyBreadcrumb: {
+                label: '{"icon": "dashboard", "label": "customer.dashboards"}'
+            }
+        })
+        .state('home.dashboards.dashboard', {
+            url: '/:dashboardId',
+            module: 'private',
+            auth: ['TENANT_ADMIN', 'CUSTOMER_USER'],
+            views: {
+                "content@home": {
+                    templateUrl: dashboardTemplate,
+                    controller: 'DashboardController',
+                    controllerAs: 'vm'
+                }
+            },
+            data: {
+                widgetEditMode: false,
+                searchEnabled: false,
+                pageTitle: 'dashboard.dashboard'
+            },
+            ncyBreadcrumb: {
+                label: '{"icon": "dashboard", "label": "{{ vm.dashboard.title }}", "translate": "false"}'
+            }
+        })
+        .state('home.customers.dashboards.dashboard', {
+            url: '/:dashboardId',
+            module: 'private',
+            auth: ['TENANT_ADMIN', 'CUSTOMER_USER'],
+            views: {
+                "content@home": {
+                    templateUrl: dashboardTemplate,
+                    controller: 'DashboardController',
+                    controllerAs: 'vm'
+                }
+            },
+            data: {
+                searchEnabled: false,
+                pageTitle: 'customer.dashboard'
+            },
+            ncyBreadcrumb: {
+                label: '{"icon": "dashboard", "label": "customer.dashboard"}'
+            }
+        })
+}

diff --git a/ui/src/app/dashboard/dashboard.scss b/ui/src/app/dashboard/dashboard.scss
new file mode 100644
index 0000000..11efbec
--- /dev/null
+++ b/ui/src/app/dashboard/dashboard.scss
@@ -0,0 +1,55 @@
+/**
+ * Copyright © 2016 The Thingsboard Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+@import '../../scss/constants';
+
+section.tb-dashboard-title {
+  position: absolute;
+  top: 0;
+  left: 20px;
+}
+
+input.tb-dashboard-title {
+  font-size: 2.000rem;
+  font-weight: 500;
+  letter-spacing: 0.005em;
+  height: 38px;
+}
+
+div.tb-padded {
+  top: 60px;
+}
+
+section.tb-padded {
+  top: 60px;
+}
+
+div.tb-shrinked {
+  width: 40%;
+}
+
+tb-details-sidenav.tb-widget-details-sidenav {
+  md-sidenav.tb-sidenav-details {
+    @media (min-width: $layout-breakpoint-gt-sm) {
+      width: 85% !important;
+    }
+    @media (min-width: $layout-breakpoint-gt-md) {
+      width: 75% !important;
+    }
+    @media (min-width: $layout-breakpoint-lg) {
+      width: 60% !important;
+    }
+  }
+}

diff --git a/ui/src/app/dashboard/dashboard.tpl.html b/ui/src/app/dashboard/dashboard.tpl.html
new file mode 100644
index 0000000..b18c392
--- /dev/null
+++ b/ui/src/app/dashboard/dashboard.tpl.html
@@ -0,0 +1,177 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<md-content flex tb-expand-fullscreen="vm.widgetEditMode" hide-expand-button="vm.widgetEditMode">
+    <section ng-show="!vm.isAddingWidget && !loading && !vm.widgetEditMode" layout="row" layout-wrap
+             class="tb-header-buttons tb-top-header-buttons md-fab" ng-style="{'right': '50px'}">
+        <md-button ng-if="vm.isTenantAdmin()" ng-show="vm.isEdit" ng-disabled="loading"
+                   class="tb-btn-header md-accent md-hue-2 md-fab md-fab-bottom-right"
+                   aria-label="{{ 'action.apply' | translate }}"
+                   ng-click="vm.saveDashboard()">
+            <md-tooltip md-direction="top">
+                {{ 'action.apply-changes' | translate }}
+            </md-tooltip>
+            <ng-md-icon icon="done"></ng-md-icon>
+        </md-button>
+        <md-button ng-if="vm.isTenantAdmin()" ng-disabled="loading"
+                   class="tb-btn-header md-accent md-hue-2 md-fab md-fab-bottom-right"
+                   aria-label="{{ 'action.edit-mode' | translate }}"
+                   ng-click="vm.toggleDashboardEditMode()">
+            <md-tooltip md-direction="top">
+                {{ (vm.isEdit ? 'action.decline-changes' : 'action.enter-edit-mode') | translate }}
+            </md-tooltip>
+            <ng-md-icon icon="{{vm.isEdit ? 'close' : 'edit'}}"
+                        options='{"easing": "circ-in-out", "duration": 375, "rotation": "none"}'></ng-md-icon>
+        </md-button>
+    </section>
+    <section ng-show="!loading && vm.noData()" layout-align="center center"
+             ng-class="{'tb-padded' : !vm.widgetEditMode}"
+             style="text-transform: uppercase; display: flex; z-index: 1;"
+             class="md-headline tb-absolute-fill">
+	 <span translate ng-if="!vm.isEdit">
+		 dashboard.no-widgets
+	 </span>
+        <md-button ng-if="vm.isEdit && !vm.widgetEditMode" class="tb-add-new-widget" ng-click="vm.addWidget($event)">
+            <md-icon aria-label="{{ 'action.add' | translate }}" class="material-icons tb-md-96">add</md-icon>
+            {{ 'dashboard.add-widget' | translate }}
+        </md-button>
+    </section>
+    <section ng-if="!vm.widgetEditMode" class="tb-dashboard-title" layout="row" layout-align="center center">
+        <h3 ng-show="!vm.isEdit">{{ vm.dashboard.title }}</h3>
+        <md-input-container ng-show="vm.isEdit" class="md-block" style="height: 30px;">
+            <label translate>dashboard.title</label>
+            <input class="tb-dashboard-title" required name="title" ng-model="vm.dashboard.title">
+        </md-input-container>
+        <md-button class="md-raised" flex="none" ng-show="vm.isEdit" ng-click="vm.openDeviceAliases($event)">
+            {{ 'device.aliases' | translate }}
+        </md-button>
+    </section>
+    <div class="tb-absolute-fill" ng-class="{ 'tb-padded' : !vm.widgetEditMode, 'tb-shrinked' : vm.isEditingWidget }">
+        <tb-dashboard
+                widgets="vm.widgets"
+                device-alias-list="vm.dashboard.configuration.deviceAliases"
+                is-edit="vm.isEdit || vm.widgetEditMode"
+                is-mobile="vm.forceDashboardMobileMode"
+                is-mobile-disabled="vm.widgetEditMode"
+                is-edit-action-enabled="vm.isEdit || vm.widgetEditMode"
+                is-remove-action-enabled="vm.isEdit && !vm.widgetEditMode"
+                on-edit-widget="vm.editWidget(event, widget)"
+                on-widget-clicked="vm.widgetClicked(event, widget)"
+                on-remove-widget="vm.removeWidget(event, widget)"
+                load-widgets="vm.loadDashboard()"
+                on-init="vm.dashboardInited(dashboard)"
+                on-init-failed="vm.dashboardInitFailed(e)">
+        </tb-dashboard>
+    </div>
+    <tb-details-sidenav class="tb-widget-details-sidenav"
+                        header-title="vm.editingWidget.config.title"
+                        header-subtitle="{{vm.editingWidgetSubtitle}}"
+                        is-read-only="false"
+                        is-open="vm.isEditingWidget"
+                        is-always-edit="true"
+                        on-close-details="vm.onEditWidgetClosed()"
+                        on-toggle-details-edit-mode="vm.onRevertWidgetEdit(vm.widgetForm)"
+                        on-apply-details="vm.saveWidget(vm.widgetForm)"
+                        the-form="vm.widgetForm">
+        <details-buttons tb-help="vm.helpLinkIdForWidgetType()" help-container-id="help-container">
+            <div id="help-container"></div>
+        </details-buttons>
+        <form name="vm.widgetForm">
+            <tb-edit-widget
+                    dashboard="vm.dashboard"
+                    widget="vm.editingWidget"
+                    the-form="vm.widgetForm">
+            </tb-edit-widget>
+        </form>
+    </tb-details-sidenav>
+    <tb-details-sidenav ng-if="!vm.widgetEditMode" class="tb-select-widget-sidenav"
+                        header-title="'dashboard.select-widget-title' | translate"
+                        header-height-px="120"
+                        is-read-only="true"
+                        is-open="vm.isAddingWidget"
+                        is-edit="false"
+                        on-close-details="vm.onAddWidgetClosed()">
+        <header-pane>
+            <div layout="row">
+                <span class="tb-details-subtitle">{{ 'widgets-bundle.current' | translate }}</span>
+                <tb-widgets-bundle-select flex-offset="5"
+                                          flex
+                        ng-model="vm.widgetsBundle"
+                        tb-required="true"
+                        select-first-bundle="false">
+                </tb-widgets-bundle-select>
+            </div>
+        </header-pane>
+        <div>
+            <md-tabs ng-if="vm.timeseriesWidgetTypes.length > 0 || vm.latestWidgetTypes.length > 0 ||
+                            vm.rpcWidgetTypes.length > 0"
+                     flex
+                     class="tb-absolute-fill" md-border-bottom>
+                <md-tab ng-if="vm.timeseriesWidgetTypes.length > 0" style="height: 100%;" label="{{ 'widget.timeseries' | translate }}">
+                    <tb-dashboard
+                            widgets="vm.timeseriesWidgetTypes"
+                            is-edit="false"
+                            is-mobile="true"
+                            is-edit-action-enabled="false"
+                            is-remove-action-enabled="false"
+                            on-widget-clicked="vm.addWidgetFromType(event, widget)">
+                    </tb-dashboard>
+                </md-tab>
+                <md-tab ng-if="vm.latestWidgetTypes.length > 0" style="height: 100%;" label="{{ 'widget.latest-values' | translate }}">
+                    <tb-dashboard
+                            widgets="vm.latestWidgetTypes"
+                            is-edit="false"
+                            is-mobile="true"
+                            is-edit-action-enabled="false"
+                            is-remove-action-enabled="false"
+                            on-widget-clicked="vm.addWidgetFromType(event, widget)">
+                    </tb-dashboard>
+                </md-tab>
+                <md-tab ng-if="vm.rpcWidgetTypes.length > 0" style="height: 100%;" label="{{ 'widget.rpc' | translate }}">
+                    <tb-dashboard
+                            widgets="vm.rpcWidgetTypes"
+                            is-edit="false"
+                            is-mobile="true"
+                            is-edit-action-enabled="false"
+                            is-remove-action-enabled="false"
+                            on-widget-clicked="vm.addWidgetFromType(event, widget)">
+                    </tb-dashboard>
+                </md-tab>
+            </md-tabs>
+            <span translate ng-if="vm.timeseriesWidgetTypes.length === 0 && vm.latestWidgetTypes.length === 0 &&
+                                   vm.rpcWidgetTypes.length === 0 && vm.widgetsBundle"
+                  layout-align="center center"
+                  style="text-transform: uppercase; display: flex;"
+                  class="md-headline tb-absolute-fill">widgets-bundle.empty</span>
+            <span translate ng-if="!vm.widgetsBundle"
+                  layout-align="center center"
+                  style="text-transform: uppercase; display: flex;"
+                  class="md-headline tb-absolute-fill">widget.select-widgets-bundle</span>
+        </div>
+    </tb-details-sidenav>
+    <!-- </section> -->
+    <section layout="row" layout-wrap class="tb-footer-buttons md-fab ">
+        <md-button ng-disabled="loading" ng-if="!vm.isAddingWidget && vm.isEdit && !vm.widgetEditMode"
+                   class="tb-btn-footer md-accent md-hue-2 md-fab" ng-click="vm.addWidget($event)"
+                   aria-label="{{ 'dashboard.add-widget' | translate }}">
+            <md-tooltip md-direction="top">
+                {{ 'dashboard.add-widget' | translate }}
+            </md-tooltip>
+            <ng-md-icon icon="add"></ng-md-icon>
+        </md-button>
+    </section>
+</md-content>

diff --git a/ui/src/app/dashboard/dashboard-card.tpl.html b/ui/src/app/dashboard/dashboard-card.tpl.html
new file mode 100644
index 0000000..8151b2f
--- /dev/null
+++ b/ui/src/app/dashboard/dashboard-card.tpl.html
@@ -0,0 +1,18 @@
+<!--
+
+    Copyright © 2016 The Thingsboard Authors
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<div></div>
\ No newline at end of file