Added and Cleaned User bundle