Added completion functions and other features