Added support for custom properties against database