Added force, layout and type options. Added features