Renamed factory methods.
added serial version id.