Adjusted to DB changes