Added some additional future improvements