Added optional features with all files