Added future improvements