Feature/factory

Adds better factory support and JSON Schema support.