Added initial character support