Added custom files support + generic improvements.