Added options handling