Added custom storage fields. Added tests for new functionality. Added tests for character and options limits