Initial commit for enabling south support