Removed extra methods, added variables needed for Database storage