Reverted back to interfaces.