Simplified options. Added source option