Enhanced and added feature sets (incomplete though)