Small adjustments
Added custom_command element