Added functionality for other tables