Added linemark capabilities
Added code-fallback option