Created UnlockViewFactory and moved class-based factory methods into the
package-based factory