Updated Schema class to be happier