Removed metadata xml and updated for abstract factory.