REFACTOR: Default schema - Changed magic number to option