added custom groups
added CreateDate & fixed tables issues