Addressed comments and modified options handling