Removed dependencies, new constructor format.