Addes some functionality and added the tablename values