Updating schema name
Refactored as static class, and renamed methods to new coding standard