Database and featured partial
Security Changes