Fixed database to be wcf conform (Close #2)