Added Some Extra Features And Options