added factory girl support