Features

A few modifications to factory and interfaces