Add %M spec
Add custom spec + handel input with extension correctly