Final updates & adding database create script