Changed some methods due to recent DB changes