Removed default factory map in favour of service loader factories