Database changes, class inheritance added