added missing column types
added default exception throw