Added core and finance module