Updated to new format.
Added methods.
Added dependencies.