Added custom options code